summaryrefslogtreecommitdiffstats
path: root/drivers/media/rc/Kconfig
diff options
context:
space:
mode:
authorMauro Carvalho Chehab2012-07-06 14:21:13 +0200
committerMauro Carvalho Chehab2012-07-06 14:21:13 +0200
commit94f74767160ab0d288f3b416971cf259f2a38b3d (patch)
treec847311f6761786669315e2af90b3f5696da8a43 /drivers/media/rc/Kconfig
parent[media] Kconfig: Split the core support options from the driver ones (diff)
downloadkernel-qcow2-linux-94f74767160ab0d288f3b416971cf259f2a38b3d.tar.gz
kernel-qcow2-linux-94f74767160ab0d288f3b416971cf259f2a38b3d.tar.xz
kernel-qcow2-linux-94f74767160ab0d288f3b416971cf259f2a38b3d.zip
[media] rc/Kconfig: Move a LIRC sub-option to the right place
The IR to LIRC option were at the wrong sub-menu. Move it to the right place. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/rc/Kconfig')
-rw-r--r--drivers/media/rc/Kconfig21
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index 2478b06a768b..908ef70430e9 100644
--- a/drivers/media/rc/Kconfig
+++ b/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