diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-05-03 14:17:31 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-05-03 14:17:31 -0400 |
| commit | dee79512a9d26c008623ef7b193eb7440567e186 (patch) | |
| tree | 4e7f171fef0fb2183b0650abb813fae69c73b827 | |
| parent | 113182f6138901821b513eaf424f403ae0d7aa23 (diff) | |
| download | mediapointer-dvb-s2-dee79512a9d26c008623ef7b193eb7440567e186.tar.gz mediapointer-dvb-s2-dee79512a9d26c008623ef7b193eb7440567e186.tar.bz2 | |
fix build for older gcc's that dont support compiler macros in a function call
From: Julian Scheel <julian@jusst.de>
This patch fixes the build when using older gcc-versions which
do not support compiler-macros in a function-call.
Signed-off-by: Julian Scheel <julian@jusst.de>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-i2c.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/video/tuner-core.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-i2c.c b/linux/drivers/media/video/cx88/cx88-i2c.c index 1e9bd01de..69a39ad68 100644 --- a/linux/drivers/media/video/cx88/cx88-i2c.c +++ b/linux/drivers/media/video/cx88/cx88-i2c.c @@ -98,10 +98,11 @@ static int attach_inform(struct i2c_client *client) struct tuner_setup tun_setup; struct cx88_core *core = i2c_get_adapdata(client->adapter); - dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n", #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) + dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n", client->driver->name, client->addr, client->name); #else + dprintk(1, "%s i2c attach [addr=0x%x,client=%s]\n", client->driver->driver.name, client->addr, client->name); #endif if (!client->driver->command) diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c index 00e073944..21bc09dda 100644 --- a/linux/drivers/media/video/tuner-core.c +++ b/linux/drivers/media/video/tuner-core.c @@ -257,13 +257,15 @@ static void set_type(struct i2c_client *c, unsigned int type, t->mode_mask = new_mode_mask; set_freq(c, (V4L2_TUNER_RADIO == t->mode) ? t->radio_freq : t->tv_freq); - tuner_dbg("%s %s I2C addr 0x%02x with type %d used for 0x%02x\n", #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) + tuner_dbg("%s %s I2C addr 0x%02x with type %d used for 0x%02x\n", c->adapter->name, c->driver->name, c->addr << 1, type, + t->mode_mask); #else + tuner_dbg("%s %s I2C addr 0x%02x with type %d used for 0x%02x\n", c->adapter->name, c->driver->driver.name, c->addr << 1, type, -#endif t->mode_mask); +#endif } /* |