Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e3c82a0 authored by Todd Kjos's avatar Todd Kjos
Browse files

ANDROID: fix VIDEOBUF2_CORE dependency in 'allmodconfig' builds 



Fix missing dependency for CONFIG_VIDEOBUF2_CORE for
'allmodconfig' builds. Since CONFIG_MEDIA_SUPPORT is
always selected, drop it from gki_defconfig

Fixes: 64923894 ("ANDROID: init: GKI: enable hidden configs
for media")

Test: successful 'allmodconfig' build
Change-Id: I1dd5ff154c1aeb90457c23dc233cb32595bd9bed
Signed-off-by: default avatarTodd Kjos <tkjos@google.com>
parent 54087918

arch/arm64/configs/gki_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -298,7 +298,6 @@ CONFIG_WATCHDOG=y 
CONFIG_MFD_ACT8945A=y

CONFIG_MFD_SYSCON=y

CONFIG_REGULATOR=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_CONTROLLER=y

# CONFIG_VGA_ARB is not set

arch/x86/configs/gki_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -257,7 +257,6 @@ CONFIG_GPIOLIB=y 
CONFIG_DEVFREQ_THERMAL=y

# CONFIG_X86_PKG_TEMP_THERMAL is not set

CONFIG_REGULATOR=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_DRM=y

# CONFIG_DRM_FBDEV_EMULATION is not set

init/Kconfig.gki

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ config GKI_HIDDEN_QCOM_CONFIGS 
config GKI_HIDDEN_MEDIA_CONFIGS

	bool "Hidden Media configs needed for GKI"

	select VIDEOBUF2_CORE

	select MEDIA_SUPPORT

	help

	  Dummy config option used to enable hidden media configs.

	  These are normally selected implicitely when a module