From dccd5d2cf7e263b6a59fbe382c15674dd99bc6b5 Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Wed, 17 Aug 2022 17:09:55 +0000 Subject: [PATCH] ANDROID: add VIDEO_V4L2_SUBDEV_API to the GKI_HIDDEN_MEDIA_CONFIGS The upstream commit 817819b27e25 ("media: Replace dependency on VIDEO_V4L2_SUBDEV_API with select") made VIDEO_V4L2_SUBDEV_API hidden to clean up the code. Since GKI wants to include this config without including the specific vendor drivers that select this config, add it to the GKI_HIDDEN_MEDIA_CONFIGS. Fixes: 817819b27e25 ("media: Replace dependency on VIDEO_V4L2_SUBDEV_API with select") Signed-off-by: Will McVicker Signed-off-by: Greg Kroah-Hartman Change-Id: I3db3b4cb2de0a1e3a282c5bdb5b584892a8b1fcc --- arch/arm64/configs/gki_defconfig | 1 - arch/x86/configs/gki_defconfig | 1 - init/Kconfig.gki | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 626734c3835d..7c00ddcb192c 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -425,7 +425,6 @@ CONFIG_MEDIA_CEC_RC=y # CONFIG_MEDIA_RADIO_SUPPORT is not set # CONFIG_MEDIA_SDR_SUPPORT is not set # CONFIG_MEDIA_TEST_SUPPORT is not set -CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_MEDIA_USB_SUPPORT=y CONFIG_USB_GSPCA=y CONFIG_USB_VIDEO_CLASS=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 0689f430b101..97603d91c865 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -380,7 +380,6 @@ CONFIG_MEDIA_CEC_RC=y # CONFIG_MEDIA_RADIO_SUPPORT is not set # CONFIG_MEDIA_SDR_SUPPORT is not set # CONFIG_MEDIA_TEST_SUPPORT is not set -CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_MEDIA_USB_SUPPORT=y CONFIG_USB_GSPCA=y CONFIG_USB_VIDEO_CLASS=y diff --git a/init/Kconfig.gki b/init/Kconfig.gki index 5e2316d66325..4f1481cbc095 100644 --- a/init/Kconfig.gki +++ b/init/Kconfig.gki @@ -95,6 +95,7 @@ config GKI_HIDDEN_MEDIA_CONFIGS select CEC_PIN select VIDEOBUF2_DMA_CONTIG select VIDEOBUF2_DMA_SG + select VIDEO_V4L2_SUBDEV_API help Dummy config option used to enable hidden media configs. These are normally selected implicitly when a module