ANDROID: update gki_defconfig for 5.6-rc3

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ib73b80782fadd1302d8e7ade231943a1cd65ee99
This commit is contained in:
Greg Kroah-Hartman
2020-02-24 15:14:59 +01:00
parent 5fba1b18cf
commit a466a46809

View File

@@ -119,7 +119,6 @@ CONFIG_IPV6_MIP6=y
CONFIG_IPV6_VTI=y
CONFIG_IPV6_MULTIPLE_TABLES=y
CONFIG_NETFILTER=y
# CONFIG_BRIDGE_NETFILTER is not set
CONFIG_NF_CONNTRACK=y
CONFIG_NF_CONNTRACK_SECMARK=y
CONFIG_NF_CONNTRACK_EVENTS=y
@@ -364,7 +363,6 @@ CONFIG_DMADEVICES=y
CONFIG_UIO=y
CONFIG_STAGING=y
CONFIG_ASHMEM=y
CONFIG_ANDROID_VSOC=y
CONFIG_ION=y
CONFIG_ION_SYSTEM_HEAP=y
CONFIG_COMMON_CLK_SCPI=y