From dc02e7f0890fa0aa26b84c367e2f1d15a400f7df Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Sun, 11 Sep 2005 05:39:23 +0000 Subject: * 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 Signed-off-by: Michael Krufky --- linux/include/media/tuner.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'linux/include') 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__ */ -- cgit v1.2.3