diff options
| -rw-r--r-- | linux/drivers/media/video/bttv-cards.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-input.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/tvaudio.c | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/tveeprom.c | 6 | ||||
| -rw-r--r-- | linux/include/media/tuner.h | 8 | ||||
| -rw-r--r-- | v4l/ChangeLog | 14 |
6 files changed, 27 insertions, 15 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c index 696f9f125..72bc3535d 100644 --- a/linux/drivers/media/video/bttv-cards.c +++ b/linux/drivers/media/video/bttv-cards.c @@ -1,5 +1,5 @@ /* - $Id: bttv-cards.c,v 1.74 2005/09/10 07:33:02 mkrufky Exp $ + $Id: bttv-cards.c,v 1.75 2005/09/11 05:39:23 mkrufky Exp $ bttv-cards.c @@ -445,7 +445,6 @@ struct tvcard bttv_tvcards[] = { .video_inputs = 3, .audio_inputs = 1, .tuner = 0, - .tuner_addr = ADDR_UNSET, .svhs = 2, .gpiomask = 3, .muxsel = { 2, 3, 1, 1}, @@ -472,7 +471,6 @@ struct tvcard bttv_tvcards[] = { .video_inputs = 3, .audio_inputs = 1, .tuner = 0, - .tuner_addr = ADDR_UNSET, .svhs = 2, .gpiomask = 0x3014f, .muxsel = { 2, 3, 1, 1}, diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c index b58cb3187..37a73ffba 100644 --- a/linux/drivers/media/video/cx88/cx88-input.c +++ b/linux/drivers/media/video/cx88/cx88-input.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-input.c,v 1.19 2005/09/04 13:36:10 mkrufky Exp $ + * $Id: cx88-input.c,v 1.20 2005/09/11 05:39:23 mkrufky Exp $ * * Device driver for GPIO attached remote control interfaces * on Conexant 2388x based TV/DVB cards. @@ -288,7 +288,7 @@ module_param(ir_debug, int, 0644); /* debug level [IR] */ MODULE_PARM_DESC(ir_debug, "enable debug messages [IR]"); #define ir_dprintk(fmt, arg...) if (ir_debug) \ - printk(KERN_DEBUG "%s IR: " fmt , ir->core->name, ## arg) + printk(KERN_DEBUG "%s IR: " fmt , ir->core->name , ##arg) /* ---------------------------------------------------------------------- */ diff --git a/linux/drivers/media/video/tvaudio.c b/linux/drivers/media/video/tvaudio.c index a2e001fb2..e93e08d52 100644 --- a/linux/drivers/media/video/tvaudio.c +++ b/linux/drivers/media/video/tvaudio.c @@ -56,14 +56,14 @@ MODULE_LICENSE("GPL"); #define tvaudio_info(fmt, arg...) do {\ printk(KERN_INFO "tvaudio %d-%04x: " fmt, \ - chip->c.adapter->nr, chip->c.addr, ## arg); } while (0) + chip->c.adapter->nr, chip->c.addr , ##arg); } while (0) #define tvaudio_warn(fmt, arg...) do {\ printk(KERN_WARNING "tvaudio %d-%04x: " fmt, \ - chip->c.adapter->nr, chip->c.addr, ## arg); } while (0) + chip->c.adapter->nr, chip->c.addr , ##arg); } while (0) #define tvaudio_dbg(fmt, arg...) do {\ if (debug) \ printk(KERN_INFO "tvaudio %d-%04x: " fmt, \ - chip->c.adapter->nr, chip->c.addr, ## arg); } while (0) + chip->c.adapter->nr, chip->c.addr , ##arg); } while (0) /* ---------------------------------------------------------------------- */ /* our structs */ diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c index 741170b18..6cfe69325 100644 --- a/linux/drivers/media/video/tveeprom.c +++ b/linux/drivers/media/video/tveeprom.c @@ -54,14 +54,14 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)"); #define tveeprom_info(fmt, arg...) do {\ printk(KERN_INFO "tveeprom %d-%04x: " fmt, \ - c->adapter->nr, c->addr, ## arg); } while (0) + c->adapter->nr, c->addr , ##arg); } while (0) #define tveeprom_warn(fmt, arg...) do {\ printk(KERN_WARNING "tveeprom %d-%04x: " fmt, \ - c->adapter->nr, c->addr, ## arg); } while (0) + c->adapter->nr, c->addr , ##arg); } while (0) #define tveeprom_dbg(fmt, arg...) do {\ if (debug) \ printk(KERN_INFO "tveeprom %d-%04x: " fmt, \ - c->adapter->nr, c->addr, ## arg); } while (0) + c->adapter->nr, c->addr , ##arg); } while (0) /* ----------------------------------------------------------------------- */ diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index 0e160360f..2687b1cb7 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -1,4 +1,4 @@ -/* $Id: tuner.h,v 1.50 2005/08/30 04:47:44 mchehab Exp $ +/* $Id: tuner.h,v 1.51 2005/09/11 05:39:23 mkrufky Exp $ * tuner.h - definition for different tuners @@ -211,14 +211,14 @@ extern int tea5767_autodetection(struct i2c_client *c); #define tuner_warn(fmt, arg...) do {\ printk(KERN_WARNING "%s %d-%04x: " fmt, t->i2c.driver->name, \ - t->i2c.adapter->nr, t->i2c.addr, ## arg); } while (0) + t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0) #define tuner_info(fmt, arg...) do {\ printk(KERN_INFO "%s %d-%04x: " fmt, t->i2c.driver->name, \ - t->i2c.adapter->nr, t->i2c.addr, ## arg); } while (0) + t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0) #define tuner_dbg(fmt, arg...) do {\ if (tuner_debug) \ printk(KERN_DEBUG "%s %d-%04x: " fmt, t->i2c.driver->name, \ - t->i2c.adapter->nr, t->i2c.addr, ## arg); } while (0) + t->i2c.adapter->nr, t->i2c.addr , ##arg); } while (0) #endif /* __KERNEL__ */ diff --git a/v4l/ChangeLog b/v4l/ChangeLog index b354891ee..47ef77aca 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,17 @@ +2005-09-11 05:29 mkrufky + + * bttv-cards.c: + - duplicate initializer + (near initialization for `bttv_tvcards[9].tuner_addr') + duplicate initializer + (near initialization for `bttv_tvcards[11].tuner_addr') + + * cx88-input.c, tuner.h, tvaudio.c, tveeprom.c: + - Work around gcc-2.95.x macro expansion bug + + Signed-off-by: Andrew Morton <akpm@osdl.org> + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-09-11 04:56 mkrufky * cx88-core.c: (cx88_risc_decode): |