summaryrefslogtreecommitdiff
path: root/lirc/kernel-2.6.39.patch
blob: 7353d61ca8ee5e5190be927a0d49388dfa80932a (plain)
    1 diff -ru lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c
    2 --- lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c	2011-03-25 23:28:18.000000000 +0100
    3 +++ lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c	2011-06-07 17:02:20.356580306 +0200
    4 @@ -48,7 +48,6 @@
    5  #include <linux/slab.h>
    6  #include <linux/module.h>
    7  #include <linux/kmod.h>
    8 -#include <linux/smp_lock.h>
    9  #include <linux/completion.h>
   10  #include <linux/uaccess.h>
   11  #include <linux/usb.h>
   12 diff -ru lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c
   13 --- lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c	2011-03-25 23:28:18.000000000 +0100
   14 +++ lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c	2011-06-07 17:04:19.725933627 +0200
   15 @@ -555,8 +555,8 @@
   16  		kfree(ir);
   17  		return -EINVAL;
   18  	}
   19 -	printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n",
   20 -	       adap->id, addr, ir->c.name);
   21 +	printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n",
   22 +	       addr, ir->c.name);
   23  
   24  #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
   25  	/* register device */
   26 diff -ru lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c
   27 --- lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c	2011-03-25 23:28:18.000000000 +0100
   28 +++ lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c	2011-06-07 17:07:23.984935411 +0200
   29 @@ -361,14 +361,14 @@
   30  		size = count << 3;
   31  
   32  		ldata = (unsigned long *) data_buf;
   33 -		next_one = generic_find_next_le_bit(ldata, size, 0);
   34 +		next_one = find_next_zero_bit_le(ldata, size, 0);
   35  
   36  		if (next_one > 0)
   37  			put_pulse_bit(next_one
   38  				* WPC8769L_USECS_PER_BIT);
   39  
   40  		while (next_one < size) {
   41 -			next_zero = generic_find_next_zero_le_bit(ldata,
   42 +			next_zero = find_next_zero_bit_le(ldata,
   43  				size, next_one + 1);
   44  
   45  			put_space_bit(
   46 @@ -376,7 +376,7 @@
   47  				* WPC8769L_USECS_PER_BIT);
   48  
   49  			if (next_zero < size) {
   50 -				next_one = generic_find_next_le_bit(ldata,
   51 +				next_one = find_next_bit_le(ldata,
   52  					size, next_zero + 1);
   53  
   54  				put_pulse_bit(

Generated by cgit