diff options
| author | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-04-15 09:46:06 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-04-15 09:46:54 +0200 |
| commit | 9393d050c860a8f03f1e04d380653d23c7911c90 (patch) | |
| tree | b7162216ed591bc32bc91df0cb045cb25a639bb1 | |
| parent | 860b511766a3d95308a942ac09a34e4d1839e706 (diff) | |
Revert "media: Kconfig: move CEC-specific options to cec/Kconfig"
The CEC_CORE symbols are selected by DRM, and should be
independent of MEDIA_SUPPORT.
Fixes this warning when doing "make multi_v7_defconfig":
WARNING: unmet direct dependencies detected for CEC_CORE
Depends on [m]: MEDIA_SUPPORT [=m]
Selected by [y]:
- DRM_TEGRA [=y] && HAS_IOMEM [=y] && (ARCH_TEGRA [=y] || ARM [=y] && COMPILE_TEST [=n]) && COMMON_CLK [=y] && DRM [=y] && OF [=y] && CEC_NOTIFIER [=y]
Selected by [m]:
- VIDEO_SAMSUNG_S5P_CEC [=m] && MEDIA_SUPPORT [=m] && MEDIA_PLATFORM_SUPPORT [=y] && CEC_PLATFORM_DRIVERS [=y] && (ARCH_EXYNOS [=y] || COMPILE_TEST [=n])
- DRM_EXYNOS_HDMI [=y] && HAS_IOMEM [=y] && DRM_EXYNOS [=m] && (DRM_EXYNOS_MIXER [=y] || DRM_EXYNOS5433_DECON [=n]) && CEC_NOTIFIER [=y]
- DRM_I2C_ADV7511_CEC [=y] && HAS_IOMEM [=y] && DRM [=y] && DRM_BRIDGE [=y] && DRM_I2C_ADV7511 [=m]
- DRM_DW_HDMI [=m] && HAS_IOMEM [=y] && DRM [=y] && DRM_BRIDGE [=y] && CEC_NOTIFIER [=y]
This reverts commit f1991411257bdb68d96ef8c8c5b35f412b480375.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
| -rw-r--r-- | drivers/media/Kconfig | 13 | ||||
| -rw-r--r-- | drivers/media/cec/Kconfig | 10 |
2 files changed, 13 insertions, 10 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index a8def1591352..836c2be6c522 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig @@ -3,6 +3,19 @@ # Multimedia device configuration # +# +# NOTE: Those symbols can't depend on MEDIA_SUPPORT, as it would cause +# unmatched dependencies +# +config CEC_CORE + tristate + +config CEC_NOTIFIER + bool + +config CEC_PIN + bool + source "drivers/media/rc/Kconfig" menuconfig MEDIA_SUPPORT diff --git a/drivers/media/cec/Kconfig b/drivers/media/cec/Kconfig index 31417feaa213..c01919713ab9 100644 --- a/drivers/media/cec/Kconfig +++ b/drivers/media/cec/Kconfig @@ -1,14 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only - -config CEC_CORE - tristate - -config CEC_NOTIFIER - bool - -config CEC_PIN - bool - config MEDIA_CEC_RC bool "HDMI CEC RC integration" depends on CEC_CORE && RC_CORE |