From b5e512c42c54bbb1cca486e11477679774c7afb3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 22 Jun 2020 15:45:56 +0200 Subject: [PATCH] ANDROID: GKI: update gki defconfigs Update the gki defconfig files based on upstream changes causing some symbols to no longer be needed in the defconfig files. This means the following symbols are removed for x86 and arm64 gki defconfigs: CONFIG_MEMCG_SWAP=y CONFIG_MEDIA_CAMERA_SUPPORT=y And the following only for arm64: CONFIG_MEDIA_CONTROLLER=y Signed-off-by: Greg Kroah-Hartman Change-Id: Ie1fac5c6c873bea04f199a2b7df33d56ee3f246f --- arch/arm64/configs/gki_defconfig | 3 --- arch/x86/configs/gki_defconfig | 2 -- 2 files changed, 5 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 4b7999c91398..b344c176a835 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -15,7 +15,6 @@ CONFIG_IKHEADERS=y CONFIG_UCLAMP_TASK=y CONFIG_CGROUPS=y CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y CONFIG_BLK_CGROUP=y CONFIG_CGROUP_SCHED=y # CONFIG_FAIR_GROUP_SCHED is not set @@ -324,8 +323,6 @@ CONFIG_MFD_ACT8945A=y CONFIG_MFD_SYSCON=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_MEDIA_CAMERA_SUPPORT=y -CONFIG_MEDIA_CONTROLLER=y # CONFIG_VGA_ARB is not set CONFIG_DRM=y # CONFIG_DRM_FBDEV_EMULATION is not set diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index dfe7dc7d099d..2b617536d7ca 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -16,7 +16,6 @@ CONFIG_IKHEADERS=y CONFIG_UCLAMP_TASK=y CONFIG_CGROUPS=y CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y CONFIG_CGROUP_SCHED=y # CONFIG_FAIR_GROUP_SCHED is not set CONFIG_UCLAMP_TASK_GROUP=y @@ -282,7 +281,6 @@ CONFIG_WATCHDOG_CORE=y CONFIG_MFD_SYSCON=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_DRM=y # CONFIG_DRM_FBDEV_EMULATION is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y