Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 1203b93a572c..eae6b529713f 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -334,7 +334,7 @@ static int attach_inform(struct i2c_client *client)
         struct tuner_setup tun_setup;
 
         d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
-                client->driver->name,client->addr,i2c_clientname(client));
+                 client->driver->name, client->addr, client->name);
 
         if (!client->driver->command)
                 return 0;
@@ -370,8 +370,6 @@ static int attach_inform(struct i2c_client *client)
 }
 
 static struct i2c_algorithm saa7134_algo = {
-        .name          = "saa7134",
-        .id            = I2C_ALGO_SAA7134,
         .master_xfer   = saa7134_i2c_xfer,
         .algo_control  = algo_control,
         .functionality = functionality,
@@ -382,14 +380,14 @@ static struct i2c_adapter saa7134_adap_template = {
 #ifdef I2C_CLASS_TV_ANALOG
         .class         = I2C_CLASS_TV_ANALOG,
 #endif
-        I2C_DEVNAME("saa7134"),
-        .id            = I2C_ALGO_SAA7134,
+        .name          = "saa7134",
+        .id            = I2C_HW_SAA7134,
         .algo          = &saa7134_algo,
         .client_register = attach_inform,
 };
 
 static struct i2c_client saa7134_client_template = {
-        I2C_DEVNAME("saa7134 internal"),
+        .name   = "saa7134 internal",
 };
 
 /* ----------------------------------------------------------- */