media: Kconfig: move media controller core select to main Kconfig

Let's place the main API selections at the media/Kconfig file,
as this way we can better organize things.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index f14b583c9ee11667c19032fa2e28a35e9ac5a8ce..9c1de28ef070b3e356877a34f5648d84d21360be 100644 (file)
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -136,6 +136,15 @@ config VIDEO_DEV
        prompt "Video4Linux core" if !(MEDIA_HYBRID_USB || MEDIA_HYBRID_PCI)
        default MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT || MEDIA_PLATFORM_SUPPORT || MEDIA_TEST_SUPPORT || MEDIA_HYBRID_USB || MEDIA_HYBRID_PCI
 
+config MEDIA_CONTROLLER
+       bool "Media Controller API"
+       default MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_PLATFORM_SUPPORT
+       help
+         Enable the media controller API used to query media devices internal
+         topology and configure it dynamically.
+
+         This API is mostly used by camera interfaces in embedded platforms.
+
 #
 # DVB Core
 #      Only enables if one of DTV is selected

diff --git a/drivers/media/mc/Kconfig b/drivers/media/mc/Kconfig
index e740ace54d7f390c9d99ee5fae6641bcadaf6153..002a918c4c75bbb91f34b3e710b9e07aabf23f6d 100644 (file)
--- a/drivers/media/mc/Kconfig
+++ b/drivers/media/mc/Kconfig
@@ -5,15 +5,6 @@
 #      Selectable only for webcam/grabbers, as other drivers don't use it
 #
 
-config MEDIA_CONTROLLER
-       bool "Media Controller API"
-       default MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_PLATFORM_SUPPORT
-       help
-         Enable the media controller API used to query media devices internal
-         topology and configure it dynamically.
-
-         This API is mostly used by camera interfaces in embedded platforms.
-
 config MEDIA_CONTROLLER_DVB
        bool "Enable Media controller for DVB (EXPERIMENTAL)"
        depends on MEDIA_CONTROLLER && DVB_CORE