Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / rc / Kconfig

diff --git a/drivers/media/IR/Kconfig b/drivers/media/rc/Kconfig
similarity index 75%
rename from drivers/media/IR/Kconfig
rename to drivers/media/rc/Kconfig
index aa4163eb7a83b3c64fd6b6fa3b815336b3a4ad0e..3785162f928e64e0b339965d4ad923d343768593 100644 (file)
--- a/drivers/media/IR/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -1,21 +1,17 @@
-menuconfig IR_CORE
-       tristate "Infrared remote controller adapters"
+menuconfig RC_CORE
+       tristate "Remote Controller adapters"
        depends on INPUT
        default INPUT
        ---help---
          Enable support for Remote Controllers on Linux. This is
          needed in order to support several video capture adapters.
+         Currently, all supported devices use InfraRed.
 
          Enable this option if you have a video capture board even
          if you don't need IR, as otherwise, you may not be able to
          compile the driver for your adapter.
 
-config VIDEO_IR
-       tristate
-       depends on IR_CORE
-       default IR_CORE
-
-if IR_CORE
+if RC_CORE
 
 config LIRC
        tristate
@@ -28,11 +24,11 @@ config LIRC
           LIRC daemon handles protocol decoding for IR reception and
           encoding for IR transmitting (aka "blasting").
 
-source "drivers/media/IR/keymaps/Kconfig"
+source "drivers/media/rc/keymaps/Kconfig"
 
 config IR_NEC_DECODER
        tristate "Enable IR raw decoder for the NEC protocol"
-       depends on IR_CORE
+       depends on RC_CORE
        select BITREVERSE
        default y
 
@@ -42,7 +38,7 @@ config IR_NEC_DECODER
 
 config IR_RC5_DECODER
        tristate "Enable IR raw decoder for the RC-5 protocol"
-       depends on IR_CORE
+       depends on RC_CORE
        select BITREVERSE
        default y
 
@@ -52,7 +48,7 @@ config IR_RC5_DECODER
 
 config IR_RC6_DECODER
        tristate "Enable IR raw decoder for the RC6 protocol"
-       depends on IR_CORE
+       depends on RC_CORE
        select BITREVERSE
        default y
 
@@ -62,7 +58,7 @@ config IR_RC6_DECODER
 
 config IR_JVC_DECODER
        tristate "Enable IR raw decoder for the JVC protocol"
-       depends on IR_CORE
+       depends on RC_CORE
        select BITREVERSE
        default y
 
@@ -72,7 +68,7 @@ config IR_JVC_DECODER
 
 config IR_SONY_DECODER
        tristate "Enable IR raw decoder for the Sony protocol"
-       depends on IR_CORE
+       depends on RC_CORE
        default y
 
        ---help---
@@ -81,7 +77,7 @@ config IR_SONY_DECODER
 
 config IR_RC5_SZ_DECODER
        tristate "Enable IR raw decoder for the RC-5 (streamzap) protocol"
-       depends on IR_CORE
+       depends on RC_CORE
        select BITREVERSE
        default y
 
@@ -93,7 +89,7 @@ config IR_RC5_SZ_DECODER
 
 config IR_LIRC_CODEC
        tristate "Enable IR to LIRC bridge"
-       depends on IR_CORE
+       depends on RC_CORE
        depends on LIRC
        default y
 
@@ -104,7 +100,7 @@ config IR_LIRC_CODEC
 config IR_ENE
        tristate "ENE eHome Receiver/Transceiver (pnp id: ENE0100/ENE02xxx)"
        depends on PNP
-       depends on IR_CORE
+       depends on RC_CORE
        ---help---
           Say Y here to enable support for integrated infrared receiver
           /transceiver made by ENE.
@@ -118,7 +114,7 @@ config IR_ENE
 config IR_IMON
        tristate "SoundGraph iMON Receiver and Display"
        depends on USB_ARCH_HAS_HCD
-       depends on IR_CORE
+       depends on RC_CORE
        select USB
        ---help---
           Say Y here if you want to use a SoundGraph iMON (aka Antec Veris)
@@ -130,7 +126,7 @@ config IR_IMON
 config IR_MCEUSB
        tristate "Windows Media Center Ed. eHome Infrared Transceiver"
        depends on USB_ARCH_HAS_HCD
-       depends on IR_CORE
+       depends on RC_CORE
        select USB
        ---help---
           Say Y here if you want to use a Windows Media Center Edition
@@ -142,7 +138,7 @@ config IR_MCEUSB
 config IR_NUVOTON
        tristate "Nuvoton w836x7hg Consumer Infrared Transceiver"
        depends on PNP
-       depends on IR_CORE
+       depends on RC_CORE
        ---help---
           Say Y here to enable support for integrated infrared receiver
           /transciever made by Nuvoton (formerly Winbond). This chip is
@@ -155,7 +151,7 @@ config IR_NUVOTON
 config IR_STREAMZAP
        tristate "Streamzap PC Remote IR Receiver"
        depends on USB_ARCH_HAS_HCD
-       depends on IR_CORE
+       depends on RC_CORE
        select USB
        ---help---
           Say Y here if you want to use a Streamzap PC Remote
@@ -164,4 +160,34 @@ config IR_STREAMZAP
           To compile this driver as a module, choose M here: the
           module will be called streamzap.
 
-endif #IR_CORE
+config IR_WINBOND_CIR
+        tristate "Winbond IR remote control"
+        depends on X86 && PNP
+       depends on RC_CORE
+        select NEW_LEDS
+        select LEDS_CLASS
+        select LEDS_TRIGGERS
+        select BITREVERSE
+       ---help---
+           Say Y here if you want to use the IR remote functionality found
+           in some Winbond SuperI/O chips. Currently only the WPCD376I
+           chip is supported (included in some Intel Media series
+          motherboards).
+
+           To compile this driver as a module, choose M here: the module will
+          be called winbond_cir.
+
+config RC_LOOPBACK
+       tristate "Remote Control Loopback Driver"
+       depends on RC_CORE
+       ---help---
+          Say Y here if you want support for the remote control loopback
+          driver which allows TX data to be sent back as RX data.
+          This is mostly useful for debugging purposes.
+
+          If you're not sure, select N here.
+
+          To compile this driver as a module, choose M here: the module will
+          be called rc_loopback.
+
+endif #RC_CORE