aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@google.com>2020-07-06 13:53:57 +0200
committerGreg Kroah-Hartman <gregkh@google.com>2020-07-06 13:53:57 +0200
commit86b41f4984ae2c9ff147dc5d0974d9ddc1ebb7cd (patch)
treeebb99b5a49f57af82bf93094984e628dac96b176
parentca9814bc63d1cfa545f71721503c1cee2d2c92f5 (diff)
ANDROID: GKI: drop CONFIG_UAPI_HEADER_TEST from configsASB-2020-07-05_mainline
This option is no longer able to be selected due to some dependancy changes between 5.8-rc3 and 5.8-rc4, so defconfig does not show it anymore. Remove it from the config files for now so that the build works properly. Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I5f8a214e5890c0172dc6ed4d0e015209b72393a4
-rw-r--r--arch/arm64/configs/gki_defconfig1
-rw-r--r--arch/x86/configs/gki_defconfig1
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 46af69a9bfdb..1393ab22a6e4 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -1,4 +1,3 @@
-CONFIG_UAPI_HEADER_TEST=y
CONFIG_LOCALVERSION="-mainline"
CONFIG_AUDIT=y
CONFIG_NO_HZ=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 6e8ae77cf0d5..6546b7b264a6 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -1,4 +1,3 @@
-CONFIG_UAPI_HEADER_TEST=y
CONFIG_LOCALVERSION="-mainline"
CONFIG_KERNEL_LZ4=y
# CONFIG_USELIB is not set