github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 14:04:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: GKI: re-enable CONFIG_MEDIA_CAMERA_SUPPORT

Browse Source 
MEDIA_CAMERA_SUPPORT was removed from gki_defconfig in commit
b5e512c42c ("ANDROID: GKI: update gki defconfigs") because it is
now enabled by default unless MEDIA_SUPPORT_FILTER is enabled. After
commit 4467f11504 ("ANDROID: gki_defconfig: Enable
MEDIA_SUPPORT_FILTER"), MEDIA_CAMERA_SUPPORT again needs to be
explicitly enabled.

Bug: 162909109
Signed-off-by: Connor O'Brien <connoro@google.com>
Change-Id: Ia68d6e233e86b405ea4fbc0e292e6b0778c90704
This commit is contained in:
Connor O'Brien 2020-08-21 12:39:05 -07:00
parent e6e1433248
commit 8757794ec7
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm64/configs/gki_defconfig
View File

@ -324,6 +324,7 @@ CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_MEDIA_CEC_SUPPORT=y
CONFIG_MEDIA_SUPPORT_FILTER=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_PLATFORM_SUPPORT=y
CONFIG_V4L_PLATFORM_DRIVERS=y
# CONFIG_VGA_ARB is not set

1
arch/x86/configs/gki_defconfig
View File

@ -286,6 +286,7 @@ CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_MEDIA_CEC_SUPPORT=y
CONFIG_MEDIA_SUPPORT_FILTER=y
CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_PLATFORM_SUPPORT=y
CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_DRM=y