Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle...

[pandora-kernel.git] / drivers / media / IR / Kconfig

diff --git a/drivers/media/IR/Kconfig b/drivers/media/IR/Kconfig
index 152000d..aa4163e 100644 (file)
--- a/drivers/media/IR/Kconfig
+++ b/drivers/media/IR/Kconfig
@@ -101,6 +101,20 @@ config IR_LIRC_CODEC
           Enable this option to pass raw IR to and from userspace via
           the LIRC interface.
 
+config IR_ENE
+       tristate "ENE eHome Receiver/Transceiver (pnp id: ENE0100/ENE02xxx)"
+       depends on PNP
+       depends on IR_CORE
+       ---help---
+          Say Y here to enable support for integrated infrared receiver
+          /transceiver made by ENE.
+
+          You can see if you have it by looking at lspnp output.
+          Output should include ENE0100 ENE0200 or something similar.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ene_ir.
+
 config IR_IMON
        tristate "SoundGraph iMON Receiver and Display"
        depends on USB_ARCH_HAS_HCD
@@ -125,19 +139,18 @@ 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)"
+config IR_NUVOTON
+       tristate "Nuvoton w836x7hg Consumer Infrared Transceiver"
        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.
+          /transciever made by Nuvoton (formerly Winbond). This chip is
+          found in the ASRock ION 330HT, as well as assorted Intel
+          DP55-series motherboards (and of course, possibly others).
 
           To compile this driver as a module, choose M here: the
-          module will be called ene_ir.
+          module will be called nuvoton-cir.
 
 config IR_STREAMZAP
        tristate "Streamzap PC Remote IR Receiver"