summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134/saa7134-i2c.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-i2c.c')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-i2c.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-i2c.c b/linux/drivers/media/video/saa7134/saa7134-i2c.c
index 4163c493f..1f9b91b21 100644
--- a/linux/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/linux/drivers/media/video/saa7134/saa7134-i2c.c
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134-i2c.c,v 1.28 2006/01/01 17:17:39 mchehab Exp $
+ * $Id: saa7134-i2c.c,v 1.29 2006/01/07 20:43:23 mchehab Exp $
*
* device driver for philips saa7134 based TV cards
* i2c interface support
@@ -341,7 +341,11 @@ static int attach_inform(struct i2c_client *client)
struct tuner_setup tun_setup;
d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
client->driver->name, client->addr, client->name);
+#else
+ client->driver->driver.name, client->addr, client->name);
+#endif
/* Am I an i2c remote control? */
@@ -351,7 +355,11 @@ static int attach_inform(struct i2c_client *client)
{
struct IR_i2c *ir = i2c_get_clientdata(client);
d1printk("%s i2c IR detected (%s).\n",
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
client->driver->name,ir->phys);
+#else
+ client->driver->driver.name, ir->phys);
+#endif
saa7134_set_i2c_ir(dev,ir);
break;
}