summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/bttv-i2c.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/bttv-i2c.c')
-rw-r--r--linux/drivers/media/video/bttv-i2c.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bttv-i2c.c b/linux/drivers/media/video/bttv-i2c.c
index e03d2ce52..cffc34c34 100644
--- a/linux/drivers/media/video/bttv-i2c.c
+++ b/linux/drivers/media/video/bttv-i2c.c
@@ -1,5 +1,5 @@
/*
- $Id: bttv-i2c.c,v 1.38 2006/01/01 17:17:38 mchehab Exp $
+ $Id: bttv-i2c.c,v 1.39 2006/01/07 20:43:23 mchehab Exp $
bttv-i2c.c -- all the i2c code is here
@@ -308,7 +308,11 @@ static int attach_inform(struct i2c_client *client)
if (bttv_debug)
printk(KERN_DEBUG "bttv%d: %s i2c attach [addr=0x%x,client=%s]\n",
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
btv->c.nr,client->driver->name,client->addr,
+#else
+ btv->c.nr, client->driver->driver.name, client->addr,
+#endif
client->name);
if (!client->driver->command)
return 0;