projects / packages / lirc.git / blame
| 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 |
| 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> |