---

yaml --- r: 330823 b: refs/heads/master c: c332e84 h: refs/heads/master i: 330821: 9ce9df3 330819: 012ad3a 330815: 7f194e7 v: v3
git-mirror · Aug 13, 2012 · 9fd3c46 · 9fd3c46
1 parent 28034c1
commit 9fd3c46
Show file tree

Hide file tree

Showing 5 changed files with 518 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65d9bc9236bb1f95b5d29912cc714d0c0c7bb79a
+refs/heads/master: c332e8472d7db67766bcad33390c607fdd9ac5bc
diff --git a/trunk/drivers/media/rc/Kconfig b/trunk/drivers/media/rc/Kconfig
@@ -287,6 +287,16 @@ config IR_TTUSBIR
 	   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 MACH_NOKIA_RX51 && OMAP_DM_TIMER
+	---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 gereating the carrier
+	   wave and pulses.
+
 config RC_LOOPBACK
 	tristate "Remote Control Loopback Driver"
 	depends on RC_CORE

diff --git a/trunk/drivers/media/rc/Makefile b/trunk/drivers/media/rc/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_IR_FINTEK) += fintek-cir.o
 obj-$(CONFIG_IR_NUVOTON) += nuvoton-cir.o
 obj-$(CONFIG_IR_ENE) += ene_ir.o
 obj-$(CONFIG_IR_REDRAT3) += redrat3.o
+obj-$(CONFIG_IR_RX51) += ir-rx51.o
 obj-$(CONFIG_IR_STREAMZAP) += streamzap.o
 obj-$(CONFIG_IR_WINBOND_CIR) += winbond-cir.o
 obj-$(CONFIG_RC_LOOPBACK) += rc-loopback.o