diff options
Diffstat (limited to 'linux/drivers/media/video/ir-kbd-i2c.c')
| -rw-r--r-- | linux/drivers/media/video/ir-kbd-i2c.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/linux/drivers/media/video/ir-kbd-i2c.c b/linux/drivers/media/video/ir-kbd-i2c.c index 631d58781..2bd0ce1ab 100644 --- a/linux/drivers/media/video/ir-kbd-i2c.c +++ b/linux/drivers/media/video/ir-kbd-i2c.c @@ -1,5 +1,5 @@ /* - * $Id: ir-kbd-i2c.c,v 1.12 2005/09/13 20:11:39 mkrufky Exp $ + * $Id: ir-kbd-i2c.c,v 1.13 2005/09/19 01:20:14 mkrufky Exp $ * * keyboard input driver for i2c IR remote controls * @@ -38,10 +38,9 @@ #include <linux/slab.h> #include <linux/i2c.h> #include <linux/workqueue.h> - #include <asm/semaphore.h> - #include <media/ir-common.h> +#include "compat.h" /* Mark Phalan <phalanm@o2.ie> */ static IR_KEYTAB_TYPE ir_codes_pv951[IR_KEYTAB_SIZE] = { @@ -441,11 +440,7 @@ static int ir_probe(struct i2c_adapter *adap) case I2C_HW_B_BT848: probe = probe_bttv; break; -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) case I2C_HW_SAA7134: -#else - case I2C_ALGO_SAA7134: -#endif probe = probe_saa7134; break; } |