From c9e2cfa5c6fd3b2535e977dee59da32de5d55326 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 6 Jul 2012 09:12:59 -0300
Subject: [PATCH] --- yaml --- r: 320098 b: refs/heads/master c:
 c455f5c85ab79d065d09915e73c643f4cfa0eb16 h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/media/Kconfig    |  3 ++-
 trunk/drivers/media/rc/Kconfig | 11 +++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 156a9bcafac0..2d3675b7a188 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd5534be6bc681d6a5ca62b3b6066ff8515e1aac
+refs/heads/master: c455f5c85ab79d065d09915e73c643f4cfa0eb16
diff --git a/trunk/drivers/media/Kconfig b/trunk/drivers/media/Kconfig
index 6d10ccb692a9..d941581ab921 100644
--- a/trunk/drivers/media/Kconfig
+++ b/trunk/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/trunk/drivers/media/rc/Kconfig b/trunk/drivers/media/rc/Kconfig
index d2655f103faa..2478b06a768b 100644
--- a/trunk/drivers/media/rc/Kconfig
+++ b/trunk/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"