linux: fix XBOX patch

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2013-06-05 05:12:49 +02:00
parent 14a82dffa2
commit ccbd1d87a6

View File

@ -1,9 +1,9 @@
diff -Naur linux-3.9.4/drivers/staging/media/lirc/Kconfig linux-3.9.4.patch/drivers/staging/media/lirc/Kconfig diff -Naur linux-3.6.11/drivers/staging/media/lirc/Kconfig linux-3.6.11.patch/drivers/staging/media/lirc/Kconfig
--- linux-3.9.4/drivers/staging/media/lirc/Kconfig 2013-05-24 20:45:59.000000000 +0200 --- linux-3.6.11/drivers/staging/media/lirc/Kconfig 2012-12-17 18:27:45.000000000 +0100
+++ linux-3.9.4.patch/drivers/staging/media/lirc/Kconfig 2013-05-30 18:18:57.238957100 +0200 +++ linux-3.6.11.patch/drivers/staging/media/lirc/Kconfig 2013-06-04 20:22:16.492192639 +0200
@@ -63,10 +63,17 @@ @@ -69,10 +69,17 @@
help help
Driver for the SIR IrDA port Driver for the Technotrend USB IR Receiver
+config LIRC_XBOX +config LIRC_XBOX
+ tristate "XBOX USB IR Remote" + tristate "XBOX USB IR Remote"
@ -19,9 +19,9 @@ diff -Naur linux-3.9.4/drivers/staging/media/lirc/Kconfig linux-3.9.4.patch/driv
PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards PVR-150/500, HVR-1200/1250/1700/1800, HD-PVR and other cards
+ +
endif endif
diff -Naur linux-3.9.4/drivers/staging/media/lirc/lirc_xbox.c linux-3.9.4.patch/drivers/staging/media/lirc/lirc_xbox.c diff -Naur linux-3.6.11/drivers/staging/media/lirc/lirc_xbox.c linux-3.6.11.patch/drivers/staging/media/lirc/lirc_xbox.c
--- linux-3.9.4/drivers/staging/media/lirc/lirc_xbox.c 1970-01-01 01:00:00.000000000 +0100 --- linux-3.6.11/drivers/staging/media/lirc/lirc_xbox.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-3.9.4.patch/drivers/staging/media/lirc/lirc_xbox.c 2013-05-30 18:40:22.523775446 +0200 +++ linux-3.6.11.patch/drivers/staging/media/lirc/lirc_xbox.c 2013-06-04 20:22:16.493192633 +0200
@@ -0,0 +1,995 @@ @@ -0,0 +1,995 @@
+/* +/*
+ * lirc_xbox - USB remote support for LIRC + * lirc_xbox - USB remote support for LIRC
@ -1018,12 +1018,12 @@ diff -Naur linux-3.9.4/drivers/staging/media/lirc/lirc_xbox.c linux-3.9.4.patch/
+ +
+module_param(repeat, int, S_IRUGO | S_IWUSR); +module_param(repeat, int, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(repeat, "Repeat timeout (1/100 sec) (default: 10)"); +MODULE_PARM_DESC(repeat, "Repeat timeout (1/100 sec) (default: 10)");
diff -Naur linux-3.9.4/drivers/staging/media/lirc/Makefile linux-3.9.4.patch/drivers/staging/media/lirc/Makefile diff -Naur linux-3.6.11/drivers/staging/media/lirc/Makefile linux-3.6.11.patch/drivers/staging/media/lirc/Makefile
--- linux-3.9.4/drivers/staging/media/lirc/Makefile 2013-05-24 20:45:59.000000000 +0200 --- linux-3.6.11/drivers/staging/media/lirc/Makefile 2012-12-17 18:27:45.000000000 +0100
+++ linux-3.9.4.patch/drivers/staging/media/lirc/Makefile 2013-05-30 18:17:39.163634834 +0200 +++ linux-3.6.11.patch/drivers/staging/media/lirc/Makefile 2013-06-04 20:22:48.642723020 +0200
@@ -10,4 +10,5 @@ @@ -11,4 +11,5 @@
obj-$(CONFIG_LIRC_SASEM) += lirc_sasem.o
obj-$(CONFIG_LIRC_SERIAL) += lirc_serial.o obj-$(CONFIG_LIRC_SERIAL) += lirc_serial.o
obj-$(CONFIG_LIRC_SIR) += lirc_sir.o obj-$(CONFIG_LIRC_SIR) += lirc_sir.o
obj-$(CONFIG_LIRC_TTUSBIR) += lirc_ttusbir.o
+obj-$(CONFIG_LIRC_XBOX) += lirc_xbox.o +obj-$(CONFIG_LIRC_XBOX) += lirc_xbox.o
obj-$(CONFIG_LIRC_ZILOG) += lirc_zilog.o obj-$(CONFIG_LIRC_ZILOG) += lirc_zilog.o