Merge branch 'omap-serial' of git://git.linaro.org/people/rmk/linux-arm

[firefly-linux-kernel-4.4.55.git] / drivers / media / rc / Kconfig

diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index 8be57634ba60f23e09fc5840a6bb6837920549e2..79ba242fe263a71e4c1590acad673f7c5f00d74f 100644 (file)
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -265,12 +265,40 @@ config IR_IGUANA
        depends on RC_CORE
        select USB
        ---help---
-          Say Y here if you want to use the IgaunaWorks USB IR Transceiver.
-          Both infrared receive and send are supported.
+          Say Y here if you want to use the IguanaWorks USB IR Transceiver.
+          Both infrared receive and send are supported. If you want to
+          change the ID or the pin config, use the user space driver from
+          IguanaWorks.
+
+          Only firmware 0x0205 and later is supported.
 
           To compile this driver as a module, choose M here: the module will
           be called iguanair.
 
+config IR_TTUSBIR
+       tristate "TechnoTrend USB IR Receiver"
+       depends on USB_ARCH_HAS_HCD
+       depends on RC_CORE
+       select USB
+       select NEW_LEDS
+       select LEDS_CLASS
+       ---help---
+          Say Y here if you want to use the TechnoTrend USB IR Receiver. The
+          driver can control the led.
+
+          To compile this driver as a module, choose M here: the module will
+          be called ttusbir.
+
+config IR_RX51
+       tristate "Nokia N900 IR transmitter diode"
+       depends on OMAP_DM_TIMER && LIRC
+       ---help---
+          Say Y or M here if you want to enable support for the IR
+          transmitter diode built in the Nokia N900 (RX51) device.
+
+          The driver uses omap DM timers for generating the carrier
+          wave and pulses.
+
 config RC_LOOPBACK
        tristate "Remote Control Loopback Driver"
        depends on RC_CORE