From d0dc96c6e99bdfc9bd1eeea0120cc69e84d5916c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 4 Apr 2022 16:42:28 +0200 Subject: [PATCH] ANDROID: gki defconfig movements The media tree merge for 5.18-rc1 moved some Kconfig options around so update the gki_defconfig files to fix up the build due to this housekeeping change. No config options are changed. Fixes: 182966e1cd74 ("Merge tag 'media/v5.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media") Signed-off-by: Greg Kroah-Hartman Change-Id: Ie7c1c4799507604e0352eabe7b3c300222ce4f41 --- arch/arm64/configs/gki_defconfig | 6 +++--- arch/x86/configs/gki_defconfig | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 817fcb36b2b5..9e176700d0c3 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -416,9 +416,9 @@ CONFIG_MFD_ACT8945A=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_RC_CORE=y -# CONFIG_RC_MAP is not set -CONFIG_LIRC=y CONFIG_BPF_LIRC_MODE2=y +CONFIG_LIRC=y +# CONFIG_RC_MAP is not set CONFIG_RC_DECODERS=y CONFIG_RC_DEVICES=y CONFIG_MEDIA_CEC_RC=y @@ -429,8 +429,8 @@ CONFIG_MEDIA_CEC_RC=y # CONFIG_MEDIA_TEST_SUPPORT is not set CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_MEDIA_USB_SUPPORT=y -CONFIG_USB_VIDEO_CLASS=y CONFIG_USB_GSPCA=y +CONFIG_USB_VIDEO_CLASS=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_MEM2MEM_DRIVERS=y # CONFIG_VGA_ARB is not set diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index be048e801317..c515c548c109 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -374,9 +374,9 @@ CONFIG_MFD_SYSCON=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_RC_CORE=y -# CONFIG_RC_MAP is not set -CONFIG_LIRC=y CONFIG_BPF_LIRC_MODE2=y +CONFIG_LIRC=y +# CONFIG_RC_MAP is not set CONFIG_RC_DECODERS=y CONFIG_RC_DEVICES=y CONFIG_MEDIA_CEC_RC=y @@ -387,8 +387,8 @@ CONFIG_MEDIA_CEC_RC=y # CONFIG_MEDIA_TEST_SUPPORT is not set CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_MEDIA_USB_SUPPORT=y -CONFIG_USB_VIDEO_CLASS=y CONFIG_USB_GSPCA=y +CONFIG_USB_VIDEO_CLASS=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_DRM=y