* bt832.c: (bt832_probe):

        * bttv-i2c.c: (attach_inform):
        * cx88-i2c.c: (attach_inform), (detach_inform):
        * id.h:
        * ir-kbd-i2c.c: (ir_probe):
        * msp3400.c: (msp34xx_sleep), (msp_attach):
        * saa6588.c:
        * saa6752hs.c:
        * saa7134-i2c.c: (attach_inform):
        * saa7134-tvaudio.c: (tvaudio_sleep):
        * tda7432.c: (tda7432_probe):
        * tda9875.c: (tda9875_probe):
        * tda9887.c: (tda9887_probe):
        * tuner-core.c:
        * tveeprom.c: (tveeprom_attach_adapter):
        * tvmixer.c: (tvmixer_ioctl), (tvmixer_clients),
        (tvmixer_cleanup_module):
        * video-buf.c: (videobuf_dma_free):
        - Step two, in preparation for 2.6.14-rcX compatability:
        - Compile tested against vanila kernels 2.6.13 & 2.6.8
        - 2.6.14 compile still broken...

        Signed-off-by: Michael Krufky <mkrufky@m1k.net>

1 files changed, 6 insertions, 8 deletions

diff --git a/linux/drivers/media/video/bttv-i2c.c b/linux/drivers/media/video/bttv-i2c.c
index ffcd260bf..f7d74a52c 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.26 2005/08/20 14:31:39 mkrufky Exp $
+    $Id: bttv-i2c.c,v 1.27 2005/09/13 20:11:39 mkrufky Exp $
 
     bttv-i2c.c  --  all the i2c code is here
 
@@ -109,7 +109,7 @@ static struct i2c_adapter bttv_i2c_adap_sw_template = {
 #ifdef I2C_CLASS_TV_ANALOG
 	.class             = I2C_CLASS_TV_ANALOG,
 #endif
-	I2C_DEVNAME("bt848"),
+	.name              = "bt848",
 	.id                = I2C_HW_B_BT848,
 	.client_register   = attach_inform,
 };
@@ -270,8 +270,6 @@ static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int
 }
 
 static struct i2c_algorithm bttv_algo = {
-	.name          = "bt878",
-	.id            = I2C_ALGO_BIT | I2C_HW_B_BT848 /* FIXME */,
 	.master_xfer   = bttv_i2c_xfer,
 	.algo_control  = algo_control,
 	.functionality = functionality,
@@ -282,8 +280,8 @@ static struct i2c_adapter bttv_i2c_adap_hw_template = {
 #ifdef I2C_CLASS_TV_ANALOG
 	.class         = I2C_CLASS_TV_ANALOG,
 #endif
-	I2C_DEVNAME("bt878"),
-	.id            = I2C_ALGO_BIT | I2C_HW_B_BT848 /* FIXME */,
+	.name          = "bt878",
+	.id            = I2C_HW_B_BT848 /* FIXME */,
 	.algo          = &bttv_algo,
 	.client_register = attach_inform,
 };
@@ -298,7 +296,7 @@ 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",
 			btv->c.nr,client->driver->name,client->addr,
-			i2c_clientname(client));
+			client->name);
 	if (!client->driver->command)
 		return 0;
 
@@ -326,7 +324,7 @@ void bttv_call_i2c_clients(struct bttv *btv, unsigned int cmd, void *arg)
 }
 
 static struct i2c_client bttv_i2c_client_template = {
-	I2C_DEVNAME("bttv internal"),
+	.name	= "bttv internal",
 };