[packages/lirc.git] / lirc-kernel.patch

--- lirc-0.9.0/./drivers/lirc_atiusb/lirc_atiusb.c~	2011-03-25 23:28:18.000000000 +0100
+++ lirc-0.9.0/./drivers/lirc_atiusb/lirc_atiusb.c	2011-09-10 11:19:50.422542829 +0200
@@ -48,7 +48,6 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/kmod.h>
-#include <linux/smp_lock.h>
 #include <linux/completion.h>
 #include <linux/uaccess.h>
 #include <linux/usb.h>
--- lirc-0.9.0/drivers/lirc_i2c/lirc_i2c.c~	2011-03-25 23:28:18.000000000 +0100
+++ lirc-0.9.0/drivers/lirc_i2c/lirc_i2c.c	2011-09-10 12:24:55.710859996 +0200
@@ -555,8 +555,8 @@
 		kfree(ir);
 		return -EINVAL;
 	}
-	printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n",
-	       adap->id, addr, ir->c.name);
+	printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n",
+	       addr, ir->c.name);
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
 	/* register device */
--- lirc-0.9.0/drivers/lirc_gpio/lirc_gpio.c.orig	2011-03-25 23:28:18.000000000 +0100
+++ lirc-0.9.0/drivers/lirc_gpio/lirc_gpio.c	2011-09-10 16:30:47.051485373 +0200
@@ -38,7 +38,6 @@
 #include <linux/errno.h>
 
 #include "../drivers/media/video/bt8xx/bttv.h"
-#include "../drivers/media/video/bt8xx/bttvp.h"
 
 #include "drivers/kcompat.h"
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)
--- lirc-0.9.0/drivers/lirc_serial/lirc_serial.c~	2011-03-25 23:28:18.000000000 +0100
+++ lirc-0.9.0/drivers/lirc_serial/lirc_serial.c	2012-07-01 14:29:13.757144222 +0200
@@ -48,6 +48,7 @@
  * Steve Davies <steve@daviesfam.org>  July 2001
  */
 
+#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/signal.h>
@@ -66,7 +66,9 @@
 #include <linux/poll.h>
 #include <linux/platform_device.h>
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
 #include <asm/system.h>
+#endif
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/fcntl.h>
--- lirc-0.9.0/drivers/lirc_sir/lirc_sir.c~	2011-03-25 23:28:18.000000000 +0100
+++ lirc-0.9.0/drivers/lirc_sir/lirc_sir.c	2012-07-01 14:29:56.867142704 +0200
@@ -59,7 +59,9 @@
 #include <linux/mm.h>
 #include <linux/delay.h>
 #include <linux/poll.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
 #include <asm/system.h>
+#endif
 #include <linux/io.h>
 #include <asm/irq.h>
 #include <linux/fcntl.h>
--- lirc-0.9.0/drivers/lirc_imon/lirc_imon.c~	2011-03-25 23:28:18.000000000 +0100
+++ lirc-0.9.0/drivers/lirc_imon/lirc_imon.c	2012-09-25 22:50:43.426536543 +0200
@@ -61,6 +61,11 @@
 
 #define BIT_DURATION	250	/* each bit received is 250us */
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
+#define err(format, arg...)					\
+	printk(KERN_ERR KBUILD_MODNAME ": " format "\n", ##arg)
+#endif
+
 /*** P R O T O T Y P E S ***/
 
 /* USB Callback prototypes */
--- lirc-0.9.0/drivers/lirc_sasem/lirc_sasem.c~	2011-03-25 23:28:18.000000000 +0100
+++ lirc-0.9.0/drivers/lirc_sasem/lirc_sasem.c	2012-09-25 22:51:20.226535245 +0200
@@ -73,6 +73,11 @@
 
 #define IOCTL_LCD_CONTRAST 1
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
+#define err(format, arg...)					\
+	printk(KERN_ERR KBUILD_MODNAME ": " format "\n", ##arg)
+#endif
+
 /*** P R O T O T Y P E S ***/
 
 /* USB Callback prototypes */
--- lirc-0.9.0/drivers/lirc_ttusbir/lirc_ttusbir.c~	2011-03-25 23:28:18.000000000 +0100
+++ lirc-0.9.0/drivers/lirc_ttusbir/lirc_ttusbir.c	2012-09-25 22:51:38.126534613 +0200
@@ -58,6 +58,11 @@
 #define DPRINTK(_x_, a...)
 #endif
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
+#define err(format, arg...)					\
+	printk(KERN_ERR KBUILD_MODNAME ": " format "\n", ##arg)
+#endif
+
 /* function declarations */
 static int probe(struct usb_interface *intf, const struct usb_device_id *id);
 static void disconnect(struct usb_interface *intf);
Commit	Line	Data
4d3e3b12 AM	1	--- lirc-0.9.0/./drivers/lirc_atiusb/lirc_atiusb.c~ 2011-03-25 23:28:18.000000000 +0100
	2	+++ lirc-0.9.0/./drivers/lirc_atiusb/lirc_atiusb.c 2011-09-10 11:19:50.422542829 +0200
	3	@@ -48,7 +48,6 @@
	4	#include <linux/slab.h>
	5	#include <linux/module.h>
	6	#include <linux/kmod.h>
	7	-#include <linux/smp_lock.h>
	8	#include <linux/completion.h>
	9	#include <linux/uaccess.h>
	10	#include <linux/usb.h>
	11	--- lirc-0.9.0/drivers/lirc_i2c/lirc_i2c.c~ 2011-03-25 23:28:18.000000000 +0100
	12	+++ lirc-0.9.0/drivers/lirc_i2c/lirc_i2c.c 2011-09-10 12:24:55.710859996 +0200
	13	@@ -555,8 +555,8 @@
	14	kfree(ir);
	15	return -EINVAL;
	16	}
	17	- printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n",
	18	- adap->id, addr, ir->c.name);
	19	+ printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n",
	20	+ addr, ir->c.name);
	21
	22	#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
	23	/* register device */
65e462a0 JB	24	--- lirc-0.9.0/drivers/lirc_gpio/lirc_gpio.c.orig 2011-03-25 23:28:18.000000000 +0100
	25	+++ lirc-0.9.0/drivers/lirc_gpio/lirc_gpio.c 2011-09-10 16:30:47.051485373 +0200
	26	@@ -38,7 +38,6 @@
	27	#include <linux/errno.h>
	28
	29	#include "../drivers/media/video/bt8xx/bttv.h"
	30	-#include "../drivers/media/video/bt8xx/bttvp.h"
	31
	32	#include "drivers/kcompat.h"
	33	#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)
245808fa JR	34	--- lirc-0.9.0/drivers/lirc_serial/lirc_serial.c~ 2011-03-25 23:28:18.000000000 +0100
245808fa JR	35	+++ lirc-0.9.0/drivers/lirc_serial/lirc_serial.c 2012-07-01 14:29:13.757144222 +0200
5a47949c JR	36	@@ -48,6 +48,7 @@
	37	* Steve Davies <steve@daviesfam.org> July 2001
	38	*/
	39
	40	+#include <linux/version.h>
	41	#include <linux/module.h>
	42	#include <linux/errno.h>
	43	#include <linux/signal.h>
245808fa JR	44	@@ -66,7 +66,9 @@
	45	#include <linux/poll.h>
	46	#include <linux/platform_device.h>
	47
	48	+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
	49	#include <asm/system.h>
	50	+#endif
	51	#include <linux/io.h>
	52	#include <linux/irq.h>
	53	#include <linux/fcntl.h>
	54	--- lirc-0.9.0/drivers/lirc_sir/lirc_sir.c~ 2011-03-25 23:28:18.000000000 +0100
	55	+++ lirc-0.9.0/drivers/lirc_sir/lirc_sir.c 2012-07-01 14:29:56.867142704 +0200
	56	@@ -59,7 +59,9 @@
	57	#include <linux/mm.h>
	58	#include <linux/delay.h>
	59	#include <linux/poll.h>
	60	+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
	61	#include <asm/system.h>
	62	+#endif
	63	#include <linux/io.h>
	64	#include <asm/irq.h>
	65	#include <linux/fcntl.h>
dbc525fa JR	66	--- lirc-0.9.0/drivers/lirc_imon/lirc_imon.c~ 2011-03-25 23:28:18.000000000 +0100
	67	+++ lirc-0.9.0/drivers/lirc_imon/lirc_imon.c 2012-09-25 22:50:43.426536543 +0200
	68	@@ -61,6 +61,11 @@
	69
	70	#define BIT_DURATION 250 /* each bit received is 250us */
	71
	72	+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
	73	+#define err(format, arg...) \
	74	+ printk(KERN_ERR KBUILD_MODNAME ": " format "\n", ##arg)
	75	+#endif
	76	+
	77	/* P R O T O T Y P E S */
	78
	79	/* USB Callback prototypes */
	80	--- lirc-0.9.0/drivers/lirc_sasem/lirc_sasem.c~ 2011-03-25 23:28:18.000000000 +0100
	81	+++ lirc-0.9.0/drivers/lirc_sasem/lirc_sasem.c 2012-09-25 22:51:20.226535245 +0200
	82	@@ -73,6 +73,11 @@
	83
	84	#define IOCTL_LCD_CONTRAST 1
	85
	86	+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
	87	+#define err(format, arg...) \
	88	+ printk(KERN_ERR KBUILD_MODNAME ": " format "\n", ##arg)
	89	+#endif
	90	+
	91	/* P R O T O T Y P E S */
	92
	93	/* USB Callback prototypes */
	94	--- lirc-0.9.0/drivers/lirc_ttusbir/lirc_ttusbir.c~ 2011-03-25 23:28:18.000000000 +0100
	95	+++ lirc-0.9.0/drivers/lirc_ttusbir/lirc_ttusbir.c 2012-09-25 22:51:38.126534613 +0200
	96	@@ -58,6 +58,11 @@
	97	#define DPRINTK(_x_, a...)
	98	#endif
	99
	100	+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
	101	+#define err(format, arg...) \
	102	+ printk(KERN_ERR KBUILD_MODNAME ": " format "\n", ##arg)
	103	+#endif
	104	+
	105	/* function declarations */
	106	static int probe(struct usb_interface intf, const struct usb_device_id id);
	107	static void disconnect(struct usb_interface *intf);