From 3e645698d1a783fd74540b92426eda01758a4281 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Mon, 12 Jul 2021 16:15:29 +0100 Subject: [PATCH] ANDROID: gki_defconfig: Remove commented out DRM_FBDEV_EMULATION option causing TR test failure Error: savedefconfig does not match common/arch/arm64/configs/gki_defconfig savedefconfig does not match common/arch/x86/configs/gki_defconfig Bug: 193130194 Signed-off-by: Lee Jones Change-Id: Ic199c8cd330e5e77439c5de4b9978afd6ff29d99 --- arch/arm64/configs/gki_defconfig | 1 - arch/x86/configs/gki_defconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 6df89a389b74..fd0ac397b835 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -420,7 +420,6 @@ CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_VGA_ARB is not set CONFIG_DRM=y -# CONFIG_DRM_FBDEV_EMULATION is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_SOUND=y CONFIG_SND=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 27e32a59d51d..6655e047bf93 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -377,7 +377,6 @@ CONFIG_USB_GSPCA=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_DRM=y -# CONFIG_DRM_FBDEV_EMULATION is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_SOUND=y CONFIG_SND=y