---

yaml --- r: 330803 b: refs/heads/master c: 0938069 h: refs/heads/master i: 330801: 38a6aa0 330799: fdbfe98 v: v3
git-mirror · Aug 13, 2012 · d7ebc3d · d7ebc3d
1 parent d2319dd
commit d7ebc3d
Show file tree

Hide file tree

Showing 5 changed files with 416 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 640583836b9488c806349e3839c9d8b0f15da1fa
+refs/heads/master: 0938069fa08970f1c898970c1331a029efe9a1ce
diff --git a/trunk/drivers/media/rc/Kconfig b/trunk/drivers/media/rc/Kconfig
@@ -274,6 +274,19 @@ config IR_IGUANA
 	   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 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 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
@@ -28,3 +28,4 @@ obj-$(CONFIG_IR_WINBOND_CIR) += winbond-cir.o
 obj-$(CONFIG_RC_LOOPBACK) += rc-loopback.o
 obj-$(CONFIG_IR_GPIO_CIR) += gpio-ir-recv.o
 obj-$(CONFIG_IR_IGUANA) += iguanair.o
+obj-$(CONFIG_IR_TTUSBIR) += ttusbir.o
diff --git a/trunk/drivers/media/rc/keymaps/rc-tt-1500.c b/trunk/drivers/media/rc/keymaps/rc-tt-1500.c
@@ -61,7 +61,7 @@ static struct rc_map_list tt_1500_map = {
 	.map = {
 		.scan    = tt_1500,
 		.size    = ARRAY_SIZE(tt_1500),
-		.rc_type = RC_TYPE_UNKNOWN,	/* Legacy IR type */
+		.rc_type = RC_TYPE_RC5,
 		.name    = RC_MAP_TT_1500,
 	}
 };