[media] Kconfig: Split the core support options from the driver ones

Better arrange the remote controller driver items to happen after the
core support, on their proper menus, and making clerarer what is media
core options and what is media driver options.

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 11 insertions, 3 deletions

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 6d10ccb692a9..d941581ab921 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -59,7 +59,7 @@ config MEDIA_RADIO_SUPPORT
                 support radio reception. Disabling this option will
                 disable support for them.
 
-menuconfig MEDIA_RC_SUPPORT
+config MEDIA_RC_SUPPORT
         bool "Remote Controller support"
         depends on INPUT
         ---help---
@@ -138,6 +138,7 @@ config DVB_NET
           You may want to disable the network support on embedded devices. If
           unsure say Y.
 
+comment "Media drivers"
 source "drivers/media/common/Kconfig"
 source "drivers/media/rc/Kconfig"
 
diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index d2655f103faa..2478b06a768b 100644
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -4,6 +4,14 @@ config RC_CORE
         depends on INPUT
         default y
 
+source "drivers/media/rc/keymaps/Kconfig"
+
+menuconfig RC_DECODERS
+        bool "Remote controller decoders"
+        depends on RC_CORE
+        default y
+
+if RC_DECODERS
 config LIRC
         tristate "LIRC interface driver"
         depends on RC_CORE
@@ -15,8 +23,6 @@ config LIRC
            LIRC daemon handles protocol decoding for IR reception and
            encoding for IR transmitting (aka "blasting").
 
-source "drivers/media/rc/keymaps/Kconfig"
-
 config IR_NEC_DECODER
         tristate "Enable IR raw decoder for the NEC protocol"
         depends on RC_CORE
@@ -99,6 +105,7 @@ config IR_MCE_KBD_DECODER
            Enable this option if you have a Microsoft Remote Keyboard for
            Windows Media Center Edition, which you would like to use with
            a raw IR receiver in your system.
+endif #RC_DECODERS
 
 menuconfig RC_DEVICES
         bool "Remote Controller devices"