diff options
| author | Linus Torvalds | 2017-06-06 18:37:44 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2017-06-06 18:37:44 +0200 |
| commit | 84c6c3035b1de00271362a9550389c605c7d28a0 (patch) | |
| tree | 7b8987ea4e8d5addae042173c151c042b643a931 /drivers/media/platform | |
| parent | Merge branch 'for-4.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | [media] rc-core: race condition during ir_raw_event_register() (diff) | |
| download | kernel-qcow2-linux-84c6c3035b1de00271362a9550389c605c7d28a0.tar.gz kernel-qcow2-linux-84c6c3035b1de00271362a9550389c605c7d28a0.tar.xz kernel-qcow2-linux-84c6c3035b1de00271362a9550389c605c7d28a0.zip | |
Merge tag 'media/v4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
"Some bug fixes:
- Don't fail build if atomisp has warnings
- Some CEC Kconfig changes to allow it to be used by DRM without
media dependencies
- A race fix at RC initialization code
- A driver fix at rainshadow-cec
IMHO, the one that affects most people in this series is a build fix:
if you try to build the Kernel with W=1 or using gcc7 and
all[yes|mod]config, build will fail due to -Werror at atomisp
makefiles"
* tag 'media/v4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
[media] rc-core: race condition during ir_raw_event_register()
[media] cec: drop MEDIA_CEC_DEBUG
[media] cec: rename MEDIA_CEC_NOTIFIER to CEC_NOTIFIER
[media] cec: select CEC_CORE instead of depend on it
[media] rainshadow-cec: ensure exit_loop is intialized
[media] atomisp: don't treat warnings as errors
Diffstat (limited to 'drivers/media/platform')
| -rw-r--r-- | drivers/media/platform/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/media/platform/vivid/Kconfig | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index ac026ee1ca07..041cb80a26b1 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -501,8 +501,9 @@ if CEC_PLATFORM_DRIVERS config VIDEO_SAMSUNG_S5P_CEC tristate "Samsung S5P CEC driver" - depends on CEC_CORE && (PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST) - select MEDIA_CEC_NOTIFIER + depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST + select CEC_CORE + select CEC_NOTIFIER ---help--- This is a driver for Samsung S5P HDMI CEC interface. It uses the generic CEC framework interface. @@ -511,8 +512,9 @@ config VIDEO_SAMSUNG_S5P_CEC config VIDEO_STI_HDMI_CEC tristate "STMicroelectronics STiH4xx HDMI CEC driver" - depends on CEC_CORE && (ARCH_STI || COMPILE_TEST) - select MEDIA_CEC_NOTIFIER + depends on ARCH_STI || COMPILE_TEST + select CEC_CORE + select CEC_NOTIFIER ---help--- This is a driver for STIH4xx HDMI CEC interface. It uses the generic CEC framework interface. diff --git a/drivers/media/platform/vivid/Kconfig b/drivers/media/platform/vivid/Kconfig index b36ac19dc6e4..154de92dd809 100644 --- a/drivers/media/platform/vivid/Kconfig +++ b/drivers/media/platform/vivid/Kconfig @@ -26,7 +26,8 @@ config VIDEO_VIVID config VIDEO_VIVID_CEC bool "Enable CEC emulation support" - depends on VIDEO_VIVID && CEC_CORE + depends on VIDEO_VIVID + select CEC_CORE ---help--- When selected the vivid module will emulate the optional HDMI CEC feature. |