aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/rc/Kconfig
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2012-07-06 08:21:13 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-06 08:21:13 -0400
commit94f74767160ab0d288f3b416971cf259f2a38b3d (patch)
treec847311f6761786669315e2af90b3f5696da8a43 /drivers/media/rc/Kconfig
parentc455f5c85ab79d065d09915e73c643f4cfa0eb16 (diff)
[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
23 LIRC daemon handles protocol decoding for IR reception and 23 LIRC daemon handles protocol decoding for IR reception and
24 encoding for IR transmitting (aka "blasting"). 24 encoding for IR transmitting (aka "blasting").
25 25
26config IR_LIRC_CODEC
27 tristate "Enable IR to LIRC bridge"
28 depends on RC_CORE
29 depends on LIRC
30 default y
31
32 ---help---
33 Enable this option to pass raw IR to and from userspace via
34 the LIRC interface.
35
36
26config IR_NEC_DECODER 37config IR_NEC_DECODER
27 tristate "Enable IR raw decoder for the NEC protocol" 38 tristate "Enable IR raw decoder for the NEC protocol"
28 depends on RC_CORE 39 depends on RC_CORE
@@ -113,16 +124,6 @@ menuconfig RC_DEVICES
113 124
114if RC_DEVICES 125if RC_DEVICES
115 126
116config IR_LIRC_CODEC
117 tristate "Enable IR to LIRC bridge"
118 depends on RC_CORE
119 depends on LIRC
120 default y
121
122 ---help---
123 Enable this option to pass raw IR to and from userspace via
124 the LIRC interface.
125
126config RC_ATI_REMOTE 127config RC_ATI_REMOTE
127 tristate "ATI / X10 based USB RF remote controls" 128 tristate "ATI / X10 based USB RF remote controls"
128 depends on USB_ARCH_HAS_HCD 129 depends on USB_ARCH_HAS_HCD