---

yaml --- r: 219327 b: refs/heads/master c: 6d2f5c2 h: refs/heads/master i: 219325: b8386ea 219323: dbb39ed 219319: 144c954 219311: 6823582 219295: d6da1cb 219263: 0add2cd v: v3
git-mirror · Oct 21, 2010 · dd874bc · dd874bc
1 parent 382bcb5
commit dd874bc
Show file tree

Hide file tree

Showing 5 changed files with 1,639 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72b667ebc1e7ed655ddaa8ff9abf84f8b0925d79
+refs/heads/master: 6d2f5c27880c2c72e35432eae10c7a74251050c0
diff --git a/trunk/drivers/media/IR/Kconfig b/trunk/drivers/media/IR/Kconfig
@@ -113,6 +113,19 @@ config IR_IMON
 	   To compile this driver as a module, choose M here: the
 	   module will be called imon.
 
+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 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 nuvoton-cir.
+
 config IR_MCEUSB
 	tristate "Windows Media Center Ed. eHome Infrared Transceiver"
 	depends on USB_ARCH_HAS_HCD

diff --git a/trunk/drivers/media/IR/Makefile b/trunk/drivers/media/IR/Makefile
@@ -17,5 +17,6 @@ obj-$(CONFIG_IR_LIRC_CODEC) += ir-lirc-codec.o
 # stand-alone IR receivers/transmitters
 obj-$(CONFIG_IR_IMON) += imon.o
 obj-$(CONFIG_IR_MCEUSB) += mceusb.o
+obj-$(CONFIG_IR_NUVOTON) += nuvoton-cir.o
 obj-$(CONFIG_IR_ENE) += ene_ir.o
 obj-$(CONFIG_IR_STREAMZAP) += streamzap.o