diff --git a/[refs] b/[refs]
index 2d3675b7a188..409c5ce4ac31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c455f5c85ab79d065d09915e73c643f4cfa0eb16
+refs/heads/master: 94f74767160ab0d288f3b416971cf259f2a38b3d
diff --git a/trunk/drivers/media/rc/Kconfig b/trunk/drivers/media/rc/Kconfig
index 2478b06a768b..908ef70430e9 100644
--- a/trunk/drivers/media/rc/Kconfig
+++ b/trunk/drivers/media/rc/Kconfig
@@ -23,6 +23,17 @@ config LIRC
 	   LIRC daemon handles protocol decoding for IR reception and
 	   encoding for IR transmitting (aka "blasting").
 
+config IR_LIRC_CODEC
+	tristate "Enable IR to LIRC bridge"
+	depends on RC_CORE
+	depends on LIRC
+	default y
+
+	---help---
+	   Enable this option to pass raw IR to and from userspace via
+	   the LIRC interface.
+
+
 config IR_NEC_DECODER
 	tristate "Enable IR raw decoder for the NEC protocol"
 	depends on RC_CORE
@@ -113,16 +124,6 @@ menuconfig RC_DEVICES
 
 if RC_DEVICES
 
-config IR_LIRC_CODEC
-	tristate "Enable IR to LIRC bridge"
-	depends on RC_CORE
-	depends on LIRC
-	default y
-
-	---help---
-	   Enable this option to pass raw IR to and from userspace via
-	   the LIRC interface.
-
 config RC_ATI_REMOTE
 	tristate "ATI / X10 based USB RF remote controls"
 	depends on USB_ARCH_HAS_HCD