diff options
| -rw-r--r-- | linux/drivers/media/video/ir-kbd-i2c.c | 9 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa6588.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-i2c.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/tvaudio.c | 8 | ||||
| -rw-r--r-- | v4l/ChangeLog | 13 | ||||
| -rw-r--r-- | v4l/compat.h | 8 |
6 files changed, 26 insertions, 24 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; } diff --git a/linux/drivers/media/video/saa6588.c b/linux/drivers/media/video/saa6588.c index e4a274c67..818fd1f22 100644 --- a/linux/drivers/media/video/saa6588.c +++ b/linux/drivers/media/video/saa6588.c @@ -438,9 +438,9 @@ static int saa6588_probe(struct i2c_adapter *adap) return i2c_probe(adap, &addr_data, saa6588_attach); #else switch (adap->id) { - case I2C_ALGO_BIT | I2C_HW_B_BT848: - case I2C_ALGO_BIT | I2C_HW_B_RIVA: - case I2C_ALGO_SAA7134: + case I2C_HW_B_BT848: + case I2C_HW_B_RIVA: + case I2C_HW_SAA7134: return i2c_probe(adap, &addr_data, saa6588_attach); break; } diff --git a/linux/drivers/media/video/saa7134/saa7134-i2c.c b/linux/drivers/media/video/saa7134/saa7134-i2c.c index a1c9e88dd..a199d7a76 100644 --- a/linux/drivers/media/video/saa7134/saa7134-i2c.c +++ b/linux/drivers/media/video/saa7134/saa7134-i2c.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-i2c.c,v 1.23 2005/09/13 20:11:39 mkrufky Exp $ + * $Id: saa7134-i2c.c,v 1.24 2005/09/19 01:20:14 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * i2c interface support @@ -387,11 +387,7 @@ static struct i2c_adapter saa7134_adap_template = { .class = I2C_CLASS_TV_ANALOG, #endif .name = "saa7134", -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) .id = I2C_HW_SAA7134, -#else - .id = I2C_ALGO_SAA7134, -#endif .algo = &saa7134_algo, .client_register = attach_inform, }; diff --git a/linux/drivers/media/video/tvaudio.c b/linux/drivers/media/video/tvaudio.c index 80a021ea3..4c8a7149e 100644 --- a/linux/drivers/media/video/tvaudio.c +++ b/linux/drivers/media/video/tvaudio.c @@ -1585,11 +1585,7 @@ static int chip_probe(struct i2c_adapter *adap) { /* don't attach on saa7146 based cards, because dedicated drivers are used */ -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) if ((adap->id & I2C_HW_SAA7146)) -#else - if ((adap->id & I2C_ALGO_SAA7146)) -#endif return 0; #ifdef I2C_CLASS_TV_ANALOG if (adap->class & I2C_CLASS_TV_ANALOG) @@ -1598,11 +1594,7 @@ static int chip_probe(struct i2c_adapter *adap) switch (adap->id) { case I2C_HW_B_BT848: case I2C_HW_B_RIVA: -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) case I2C_HW_SAA7134: -#else - case I2C_ALGO_SAA7134: -#endif return i2c_probe(adap, &addr_data, chip_attach); } #endif diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 9ba7a7683..174d872f4 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,16 @@ +2005-09-19 01:11 mkrufky + + * saa6588.c: (saa6588_probe): + - fix build for 2.6.14 + + * compat.h: + * ir-kbd-i2c.c: (ir_probe): + * saa7134-i2c.c: + * tvaudio.c: (chip_probe): + - removed some #if kernel version > 2.6.13 ... using compat.h instead. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-09-16 20:24 mchehab * bttv-cards.c: diff --git a/v4l/compat.h b/v4l/compat.h index 6e743935e..505031f12 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -1,5 +1,5 @@ /* - * $Id: compat.h,v 1.17 2005/09/08 22:19:56 nsh Exp $ + * $Id: compat.h,v 1.18 2005/09/19 01:20:14 mkrufky Exp $ */ #ifndef _COMPAT_H @@ -56,6 +56,12 @@ #if !defined(I2C_HW_B_CX2388x) # define I2C_HW_B_CX2388x I2C_HW_B_BT848 #endif +#if !defined(I2C_HW_SAA7134) +# define I2C_HW_SAA7134 I2C_ALGO_SAA7134 +#endif +#if !defined(I2C_HW_SAA7146) +# define I2C_HW_SAA7146 I2C_ALGO_SAA7146 +#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) #define __le32 __u32 |