---

yaml --- r: 330807 b: refs/heads/master c: a79bc3c h: refs/heads/master i: 330805: 58d4d19 330803: d7ebc3d 330799: fdbfe98 v: v3
git-mirror · Aug 13, 2012 · b875764 · b875764
1 parent cb6ccb7
commit b875764
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 384 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d07df223abb42c97dbaf2d26226c3882bcb3a3cf
+refs/heads/master: a79bc3c592063b39bd7a71456d80cf1c259e29fc
diff --git a/trunk/drivers/staging/media/lirc/Kconfig b/trunk/drivers/staging/media/lirc/Kconfig
@@ -63,12 +63,6 @@ config LIRC_SIR
 	help
 	  Driver for the SIR IrDA port
 
-config LIRC_TTUSBIR
-	tristate "Technotrend USB IR Receiver"
-	depends on LIRC && USB
-	help
-	  Driver for the Technotrend USB IR Receiver
-
 config LIRC_ZILOG
 	tristate "Zilog/Hauppauge IR Transmitter"
 	depends on LIRC && I2C

diff --git a/trunk/drivers/staging/media/lirc/Makefile b/trunk/drivers/staging/media/lirc/Makefile
@@ -10,5 +10,4 @@ obj-$(CONFIG_LIRC_PARALLEL)	+= lirc_parallel.o
 obj-$(CONFIG_LIRC_SASEM)	+= lirc_sasem.o
 obj-$(CONFIG_LIRC_SERIAL)	+= lirc_serial.o
 obj-$(CONFIG_LIRC_SIR)		+= lirc_sir.o
-obj-$(CONFIG_LIRC_TTUSBIR)	+= lirc_ttusbir.o
 obj-$(CONFIG_LIRC_ZILOG)	+= lirc_zilog.o
diff --git a/trunk/drivers/staging/media/lirc/lirc_ttusbir.c b/trunk/drivers/staging/media/lirc/lirc_ttusbir.c