tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: add VIDEO_V4L2_SUBDEV_API to the GKI_HIDDEN_MEDIA_CONFIGS

Browse Source 
The upstream commit 817819b27e ("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: 817819b27e ("media: Replace dependency on VIDEO_V4L2_SUBDEV_API with select")
Signed-off-by: Will McVicker <willmcvicker@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3db3b4cb2de0a1e3a282c5bdb5b584892a8b1fcc
This commit is contained in:
Will McVicker
2022-08-17 17:09:55 +00:00
parent 0148b24eab
commit dccd5d2cf7
3 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm64/configs/gki_defconfig
-1
View File
@@ -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
arch/x86/configs/gki_defconfig
-1
View File
@@ -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
init/Kconfig.gki
+1
View File
@@ -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