1 files changed, 33 insertions, 3 deletions

diff --git a/drivers/media/IR/Kconfig b/drivers/media/IR/Kconfig
index 999a8250b3ce..30e04915a256 100644
--- a/drivers/media/IR/Kconfig
+++ b/drivers/media/IR/Kconfig
@@ -1,8 +1,10 @@
-config IR_CORE
-        tristate
+menuconfig IR_CORE
+        tristate "Infrared remote controller adapters"
         depends on INPUT
         default INPUT
 
+if IR_CORE
+
 config VIDEO_IR
         tristate
         depends on IR_CORE
@@ -16,7 +18,7 @@ config LIRC
            Enable this option to build the Linux Infrared Remote
            Control (LIRC) core device interface driver. The LIRC
            interface passes raw IR to and from userspace, where the
-           LIRC daemon handles protocol decoding for IR reception ann
+           LIRC daemon handles protocol decoding for IR reception and
            encoding for IR transmitting (aka "blasting").
 
 source "drivers/media/IR/keymaps/Kconfig"
@@ -103,3 +105,31 @@ config IR_MCEUSB
 
            To compile this driver as a module, choose M here: the
            module will be called mceusb.
+
+config IR_ENE
+        tristate "ENE eHome Receiver/Transciever (pnp id: ENE0100/ENE02xxx)"
+        depends on PNP
+        depends on IR_CORE
+        ---help---
+           Say Y here to enable support for integrated infrared receiver
+           /transciever made by ENE.
+
+           You can see if you have it by looking at lspnp output.
+           Output should include ENE0100 ENE0200 or something similiar.
+
+           To compile this driver as a module, choose M here: the
+           module will be called ene_ir.
+
+config IR_STREAMZAP
+        tristate "Streamzap PC Remote IR Receiver"
+        depends on USB_ARCH_HAS_HCD
+        depends on IR_CORE
+        select USB
+        ---help---
+           Say Y here if you want to use a Streamzap PC Remote
+           Infrared Receiver.
+
+           To compile this driver as a module, choose M here: the
+           module will be called streamzap.
+
+endif #IR_CORE