diff options
author | Mauro Carvalho Chehab <devnull@localhost> | 2005-10-09 18:07:06 +0000 |
---|---|---|
committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-10-09 18:07:06 +0000 |
commit | 1c769dacd06c44528955753c2cac21b1d4b8ddef (patch) | |
tree | cbd22854f18480a8054382799ade8c765ab618d1 /linux/drivers/media/video/tveeprom.c | |
parent | 15e9f7c5dda7607d5080c899de36fe6003e1318c (diff) | |
download | mediapointer-dvb-s2-1c769dacd06c44528955753c2cac21b1d4b8ddef.tar.gz mediapointer-dvb-s2-1c769dacd06c44528955753c2cac21b1d4b8ddef.tar.bz2 |
From: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
- Lots of small changes to allow compiling with kernel 2.4.
Compilation result not tested yet.
- After this patch, .version should be removed, since its
syntax has changed.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/tveeprom.c')
-rw-r--r-- | linux/drivers/media/video/tveeprom.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c index 13680675f..e457e5745 100644 --- a/linux/drivers/media/video/tveeprom.c +++ b/linux/drivers/media/video/tveeprom.c @@ -53,6 +53,7 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)"); #define STRM(array,i) (i < sizeof(array)/sizeof(char*) ? array[i] : "unknown") +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) #define tveeprom_info(fmt, arg...) do {\ printk(KERN_INFO "tveeprom %d-%04x: " fmt, \ c->adapter->nr, c->addr , ##arg); } while (0) @@ -63,6 +64,18 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)"); if (debug) \ printk(KERN_INFO "tveeprom %d-%04x: " fmt, \ c->adapter->nr, c->addr , ##arg); } while (0) +#else +#define tveeprom_info(fmt, arg...) do {\ + printk(KERN_INFO "tveeprom %04x: " fmt, \ + c->addr , ##arg); } while (0) +#define tveeprom_warn(fmt, arg...) do {\ + printk(KERN_WARNING "tveeprom %04x: " fmt, \ + c->addr , ##arg); } while (0) +#define tveeprom_dbg(fmt, arg...) do {\ + if (debug) \ + printk(KERN_INFO "tveeprom %04x: " fmt, \ + c->addr , ##arg); } while (0) +#endif /* ----------------------------------------------------------------------- */ @@ -744,7 +757,9 @@ tveeprom_detach_client (struct i2c_client *client) } static struct i2c_driver i2c_driver_tveeprom = { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) .owner = THIS_MODULE, +#endif .name = "tveeprom", .id = I2C_DRIVERID_TVEEPROM, .flags = I2C_DF_NOTIFY, |