refresh for 2.6.15-rc5-git4

4 files changed, 84 insertions, 84 deletions

diff --git a/i2c/i2c-client-use-02-make-use-flag-default.patch b/i2c/i2c-client-use-02-make-use-flag-default.patch
index 0c1c7d7a4b1d5..6cf190509e67b 100644
--- a/i2c/i2c-client-use-02-make-use-flag-default.patch
+++ b/i2c/i2c-client-use-02-make-use-flag-default.patch
@@ -162,7 +162,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  {
  	.name       = "bt832",
 -	.flags      = I2C_CLIENT_ALLOW_USE,
-         .driver     = &driver,
+ 	.driver     = &driver,
  };
  
 --- gregkh-2.6.orig/drivers/media/video/bt856.c
@@ -207,17 +207,17 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  /* ----------------------------------------------------------- */
 --- gregkh-2.6.orig/drivers/media/video/msp3400.c
 +++ gregkh-2.6/drivers/media/video/msp3400.c
-@@ -1572,7 +1572,6 @@ static struct i2c_driver driver = {
+@@ -1576,7 +1576,6 @@ static struct i2c_driver driver = {
  static struct i2c_client client_template =
  {
  	.name      = "(unset)",
 -	.flags     = I2C_CLIENT_ALLOW_USE,
-         .driver    = &driver,
+ 	.driver    = &driver,
  };
  
 --- gregkh-2.6.orig/drivers/media/video/saa6588.c
 +++ gregkh-2.6/drivers/media/video/saa6588.c
-@@ -506,7 +506,6 @@ static struct i2c_driver driver = {
+@@ -505,7 +505,6 @@ static struct i2c_driver driver = {
  
  static struct i2c_client client_template = {
  	.name = "saa6588",
@@ -287,12 +287,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	saa7127_dbg("detecting saa7127 client on address 0x%x\n", address << 1);
 --- gregkh-2.6.orig/drivers/media/video/saa7134/saa6752hs.c
 +++ gregkh-2.6/drivers/media/video/saa7134/saa6752hs.c
-@@ -607,7 +607,6 @@ static struct i2c_driver driver = {
+@@ -608,7 +608,6 @@ static struct i2c_driver driver = {
  static struct i2c_client client_template =
  {
  	.name       = "saa6752hs",
 -	.flags      = I2C_CLIENT_ALLOW_USE,
-         .driver     = &driver,
+ 	.driver     = &driver,
  };
  
 --- gregkh-2.6.orig/drivers/media/video/saa7185.c
@@ -307,12 +307,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	encoder = kmalloc(sizeof(struct saa7185), GFP_KERNEL);
 --- gregkh-2.6.orig/drivers/media/video/tda9887.c
 +++ gregkh-2.6/drivers/media/video/tda9887.c
-@@ -832,7 +832,6 @@ static struct i2c_driver driver = {
+@@ -833,7 +833,6 @@ static struct i2c_driver driver = {
  static struct i2c_client client_template =
  {
  	.name      = "tda9887",
 -	.flags     = I2C_CLIENT_ALLOW_USE,
-         .driver    = &driver,
+ 	.driver    = &driver,
  };
  
 --- gregkh-2.6.orig/drivers/media/video/tuner-core.c
@@ -343,8 +343,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	client->driver = &i2c_driver_tveeprom;
 -	client->flags = I2C_CLIENT_ALLOW_USE;
  	snprintf(client->name, sizeof(client->name), "tveeprom");
-         i2c_attach_client(client);
- 	return 0;
+ 	i2c_attach_client(client);
+ 
 --- gregkh-2.6.orig/drivers/media/video/tvp5150.c
 +++ gregkh-2.6/drivers/media/video/tvp5150.c
 @@ -714,7 +714,6 @@ static struct i2c_driver driver;
diff --git a/i2c/i2c-driver-owner-cleanup-02.patch b/i2c/i2c-driver-owner-cleanup-02.patch
index 393618d8c0d9e..62f757eaf49a5 100644
--- a/i2c/i2c-driver-owner-cleanup-02.patch
+++ b/i2c/i2c-driver-owner-cleanup-02.patch
@@ -705,14 +705,14 @@ Cc: Jean Delvare <khali@linux-fr.org>
  	.id =			I2C_DRIVERID_OVCAMCHIP,
 --- gregkh-2.6.orig/drivers/media/video/saa7134/saa6752hs.c
 +++ gregkh-2.6/drivers/media/video/saa7134/saa6752hs.c
-@@ -597,7 +597,6 @@ saa6752hs_command(struct i2c_client *cli
+@@ -598,7 +598,6 @@ saa6752hs_command(struct i2c_client *cli
  
  static struct i2c_driver driver = {
  	.driver = {
 -		.owner  = THIS_MODULE,
  		.name   = "i2c saa6752hs MPEG encoder",
  	},
-         .id             = I2C_DRIVERID_SAA6752HS,
+ 	.id             = I2C_DRIVERID_SAA6752HS,
 --- gregkh-2.6.orig/drivers/video/matrox/matroxfb_maven.c
 +++ gregkh-2.6/drivers/video/matrox/matroxfb_maven.c
 @@ -1294,7 +1294,6 @@ static int maven_command(struct i2c_clie
@@ -772,7 +772,7 @@ Cc: Jean Delvare <khali@linux-fr.org>
 -		.owner  = THIS_MODULE,
  		.name   = "i2c bt832 driver",
  	},
-         .id             = -1, /* FIXME */
+ 	.id             = -1, /* FIXME */
 --- gregkh-2.6.orig/drivers/media/video/bt856.c
 +++ gregkh-2.6/drivers/media/video/bt856.c
 @@ -405,7 +405,6 @@ bt856_detach_client (struct i2c_client *
@@ -805,19 +805,19 @@ Cc: Jean Delvare <khali@linux-fr.org>
  	.id		= I2C_DRIVERID_INDYCAM,
 --- gregkh-2.6.orig/drivers/media/video/ir-kbd-i2c.c
 +++ gregkh-2.6/drivers/media/video/ir-kbd-i2c.c
-@@ -278,7 +278,6 @@ static int ir_probe(struct i2c_adapter *
+@@ -279,7 +279,6 @@ static int ir_probe(struct i2c_adapter *
  
  static struct i2c_driver driver = {
  	.driver = {
 -		.owner  = THIS_MODULE,
  		.name   = "ir remote kbd driver",
  	},
- 	.id             = I2C_DRIVERID_I2C_IR,
+ 	.id             = I2C_DRIVERID_INFRARED,
 --- gregkh-2.6.orig/drivers/media/video/msp3400.c
 +++ gregkh-2.6/drivers/media/video/msp3400.c
-@@ -1565,7 +1565,6 @@ static struct i2c_driver driver = {
-         .detach_client  = msp_detach,
-         .command        = msp_command,
+@@ -1569,7 +1569,6 @@ static struct i2c_driver driver = {
+ 	.detach_client  = msp_detach,
+ 	.command        = msp_command,
  	.driver = {
 -		.owner   = THIS_MODULE,
  		.name    = "i2c msp3400 driver",
@@ -845,7 +845,7 @@ Cc: Jean Delvare <khali@linux-fr.org>
  	.id 		= I2C_DRIVERID_SAA5249, /* in i2c.h */
 --- gregkh-2.6.orig/drivers/media/video/saa6588.c
 +++ gregkh-2.6/drivers/media/video/saa6588.c
-@@ -497,7 +497,6 @@ static int saa6588_command(struct i2c_cl
+@@ -496,7 +496,6 @@ static int saa6588_command(struct i2c_cl
  
  static struct i2c_driver driver = {
  	.driver = {
@@ -965,12 +965,12 @@ Cc: Jean Delvare <khali@linux-fr.org>
  	.id             = I2C_DRIVERID_TDA9875,
 --- gregkh-2.6.orig/drivers/media/video/tda9887.c
 +++ gregkh-2.6/drivers/media/video/tda9887.c
-@@ -823,7 +823,6 @@ static struct i2c_driver driver = {
-         .detach_client  = tda9887_detach,
-         .command        = tda9887_command,
+@@ -824,7 +824,6 @@ static struct i2c_driver driver = {
+ 	.detach_client  = tda9887_detach,
+ 	.command        = tda9887_command,
  	.driver = {
 -		.owner   = THIS_MODULE,
-         	.name    = "i2c tda9887 driver",
+ 		.name    = "i2c tda9887 driver",
  		.suspend = tda9887_suspend,
  		.resume  = tda9887_resume,
 --- gregkh-2.6.orig/drivers/media/video/tea6415c.c
@@ -1025,7 +1025,7 @@ Cc: Jean Delvare <khali@linux-fr.org>
  	.id              = I2C_DRIVERID_TVAUDIO,
 --- gregkh-2.6.orig/drivers/media/video/tveeprom.c
 +++ gregkh-2.6/drivers/media/video/tveeprom.c
-@@ -778,7 +778,6 @@ tveeprom_detach_client (struct i2c_clien
+@@ -779,7 +779,6 @@ tveeprom_detach_client (struct i2c_clien
  
  static struct i2c_driver i2c_driver_tveeprom = {
  	.driver = {
@@ -1045,7 +1045,7 @@ Cc: Jean Delvare <khali@linux-fr.org>
  #else
 --- gregkh-2.6.orig/drivers/media/video/tvp5150.c
 +++ gregkh-2.6/drivers/media/video/tvp5150.c
-@@ -802,7 +802,6 @@ static int tvp5150_detach_client(struct 
+@@ -801,7 +801,6 @@ static int tvp5150_detach_client(struct 
  
  static struct i2c_driver driver = {
  	.driver = {
diff --git a/i2c/i2c-drop-driver-flags-02-df-notify.patch b/i2c/i2c-drop-driver-flags-02-df-notify.patch
index 69022f5218ca3..95bdec0920007 100644
--- a/i2c/i2c-drop-driver-flags-02-df-notify.patch
+++ b/i2c/i2c-drop-driver-flags-02-df-notify.patch
@@ -656,12 +656,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +++ gregkh-2.6/drivers/media/video/bt832.c
 @@ -233,7 +233,6 @@ static struct i2c_driver driver = {
  	.owner          = THIS_MODULE,
-         .name           = "i2c bt832 driver",
-         .id             = -1, /* FIXME */
--        .flags          = I2C_DF_NOTIFY,
-         .attach_adapter = bt832_probe,
-         .detach_client  = bt832_detach,
-         .command        = bt832_command,
+ 	.name           = "i2c bt832 driver",
+ 	.id             = -1, /* FIXME */
+-	.flags          = I2C_DF_NOTIFY,
+ 	.attach_adapter = bt832_probe,
+ 	.detach_client  = bt832_detach,
+ 	.command        = bt832_command,
 --- gregkh-2.6.orig/drivers/media/video/bt856.c
 +++ gregkh-2.6/drivers/media/video/bt856.c
 @@ -409,7 +409,6 @@ static struct i2c_driver i2c_driver_bt85
@@ -704,24 +704,24 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.command	= indycam_command,
 --- gregkh-2.6.orig/drivers/media/video/ir-kbd-i2c.c
 +++ gregkh-2.6/drivers/media/video/ir-kbd-i2c.c
-@@ -279,7 +279,6 @@ static int ir_probe(struct i2c_adapter *
+@@ -280,7 +280,6 @@ static int ir_probe(struct i2c_adapter *
  static struct i2c_driver driver = {
  	.name           = "ir remote kbd driver",
- 	.id             = I2C_DRIVERID_I2C_IR,
+ 	.id             = I2C_DRIVERID_INFRARED,
 -	.flags          = I2C_DF_NOTIFY,
  	.attach_adapter = ir_probe,
  	.detach_client  = ir_detach,
  };
 --- gregkh-2.6.orig/drivers/media/video/msp3400.c
 +++ gregkh-2.6/drivers/media/video/msp3400.c
-@@ -1560,7 +1560,6 @@ static struct i2c_driver driver = {
+@@ -1564,7 +1564,6 @@ static struct i2c_driver driver = {
  	.owner          = THIS_MODULE,
  	.name           = "msp3400",
-         .id             = I2C_DRIVERID_MSP3400,
--        .flags          = I2C_DF_NOTIFY,
-         .attach_adapter = msp_probe,
-         .detach_client  = msp_detach,
-         .command        = msp_command,
+ 	.id             = I2C_DRIVERID_MSP3400,
+-	.flags          = I2C_DF_NOTIFY,
+ 	.attach_adapter = msp_probe,
+ 	.detach_client  = msp_detach,
+ 	.command        = msp_command,
 --- gregkh-2.6.orig/drivers/media/video/ovcamchip/ovcamchip_core.c
 +++ gregkh-2.6/drivers/media/video/ovcamchip/ovcamchip_core.c
 @@ -414,7 +414,6 @@ static struct i2c_driver driver = {
@@ -754,7 +754,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.command 	= saa5249_command
 --- gregkh-2.6.orig/drivers/media/video/saa6588.c
 +++ gregkh-2.6/drivers/media/video/saa6588.c
-@@ -499,7 +499,6 @@ static struct i2c_driver driver = {
+@@ -498,7 +498,6 @@ static struct i2c_driver driver = {
  	.owner = THIS_MODULE,
  	.name = "i2c saa6588 driver",
  	.id = -1,		/* FIXME */
@@ -824,14 +824,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.command = saa7127_command,
 --- gregkh-2.6.orig/drivers/media/video/saa7134/saa6752hs.c
 +++ gregkh-2.6/drivers/media/video/saa7134/saa6752hs.c
-@@ -599,7 +599,6 @@ static struct i2c_driver driver = {
+@@ -600,7 +600,6 @@ static struct i2c_driver driver = {
  	.owner          = THIS_MODULE,
-         .name           = "i2c saa6752hs MPEG encoder",
-         .id             = I2C_DRIVERID_SAA6752HS,
--        .flags          = I2C_DF_NOTIFY,
-         .attach_adapter = saa6752hs_probe,
-         .detach_client  = saa6752hs_detach,
-         .command        = saa6752hs_command,
+ 	.name           = "i2c saa6752hs MPEG encoder",
+ 	.id             = I2C_DRIVERID_SAA6752HS,
+-	.flags          = I2C_DF_NOTIFY,
+ 	.attach_adapter = saa6752hs_probe,
+ 	.detach_client  = saa6752hs_detach,
+ 	.command        = saa6752hs_command,
 --- gregkh-2.6.orig/drivers/media/video/saa7185.c
 +++ gregkh-2.6/drivers/media/video/saa7185.c
 @@ -491,7 +491,6 @@ static struct i2c_driver i2c_driver_saa7
@@ -884,14 +884,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.command        = tda9875_command,
 --- gregkh-2.6.orig/drivers/media/video/tda9887.c
 +++ gregkh-2.6/drivers/media/video/tda9887.c
-@@ -821,7 +821,6 @@ static struct i2c_driver driver = {
+@@ -822,7 +822,6 @@ static struct i2c_driver driver = {
  	.owner          = THIS_MODULE,
-         .name           = "i2c tda9887 driver",
-         .id             = -1, /* FIXME */
--        .flags          = I2C_DF_NOTIFY,
-         .attach_adapter = tda9887_probe,
-         .detach_client  = tda9887_detach,
-         .command        = tda9887_command,
+ 	.name           = "i2c tda9887 driver",
+ 	.id             = -1, /* FIXME */
+-	.flags          = I2C_DF_NOTIFY,
+ 	.attach_adapter = tda9887_probe,
+ 	.detach_client  = tda9887_detach,
+ 	.command        = tda9887_command,
 --- gregkh-2.6.orig/drivers/media/video/tea6415c.c
 +++ gregkh-2.6/drivers/media/video/tea6415c.c
 @@ -193,7 +193,6 @@ static struct i2c_driver driver = {
@@ -944,7 +944,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.command         = chip_command,
 --- gregkh-2.6.orig/drivers/media/video/tveeprom.c
 +++ gregkh-2.6/drivers/media/video/tveeprom.c
-@@ -781,7 +781,6 @@ static struct i2c_driver i2c_driver_tvee
+@@ -782,7 +782,6 @@ static struct i2c_driver i2c_driver_tvee
  	.owner          = THIS_MODULE,
  	.name           = "tveeprom",
  	.id             = I2C_DRIVERID_TVEEPROM,
@@ -964,7 +964,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.detach_client   = tvmixer_clients,
 --- gregkh-2.6.orig/drivers/media/video/tvp5150.c
 +++ gregkh-2.6/drivers/media/video/tvp5150.c
-@@ -807,7 +807,6 @@ static struct i2c_driver driver = {
+@@ -806,7 +806,6 @@ static struct i2c_driver driver = {
  
  	/* FIXME */
  	.id = I2C_DRIVERID_SAA7110,
diff --git a/i2c/i2c-drop-driver-owner-and-name-05-media.patch b/i2c/i2c-drop-driver-owner-and-name-05-media.patch
index 1682adec92892..79cdd7baa4407 100644
--- a/i2c/i2c-drop-driver-owner-and-name-05-media.patch
+++ b/i2c/i2c-drop-driver-owner-and-name-05-media.patch
@@ -116,14 +116,14 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
  static struct i2c_driver driver = {
 -	.owner          = THIS_MODULE,
--        .name           = "i2c bt832 driver",
+-	.name           = "i2c bt832 driver",
 +	.driver = {
 +		.owner  = THIS_MODULE,
 +		.name   = "i2c bt832 driver",
 +	},
-         .id             = -1, /* FIXME */
-         .attach_adapter = bt832_probe,
-         .detach_client  = bt832_detach,
+ 	.id             = -1, /* FIXME */
+ 	.attach_adapter = bt832_probe,
+ 	.detach_client  = bt832_detach,
 --- gregkh-2.6.orig/drivers/media/video/bt856.c
 +++ gregkh-2.6/drivers/media/video/bt856.c
 @@ -404,8 +404,10 @@ bt856_detach_client (struct i2c_client *
@@ -260,7 +260,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.detach_client	= indycam_detach,
 --- gregkh-2.6.orig/drivers/media/video/ir-kbd-i2c.c
 +++ gregkh-2.6/drivers/media/video/ir-kbd-i2c.c
-@@ -277,7 +277,10 @@ static int ir_detach(struct i2c_client *
+@@ -278,7 +278,10 @@ static int ir_detach(struct i2c_client *
  static int ir_probe(struct i2c_adapter *adap);
  
  static struct i2c_driver driver = {
@@ -269,7 +269,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +		.owner  = THIS_MODULE,
 +		.name   = "ir remote kbd driver",
 +	},
- 	.id             = I2C_DRIVERID_I2C_IR,
+ 	.id             = I2C_DRIVERID_INFRARED,
  	.attach_adapter = ir_probe,
  	.detach_client  = ir_detach,
 --- gregkh-2.6.orig/drivers/media/video/msp3400.c
@@ -318,16 +318,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
  
  #define OPMODE_AUTO    -1
-@@ -1557,13 +1560,13 @@ static int msp_resume(struct device * de
+@@ -1561,13 +1564,13 @@ static int msp_resume(struct device * de
  static void msp_wake_thread(struct i2c_client *client);
  
  static struct i2c_driver driver = {
 -	.owner          = THIS_MODULE,
 -	.name           = "msp3400",
-         .id             = I2C_DRIVERID_MSP3400,
-         .attach_adapter = msp_probe,
-         .detach_client  = msp_detach,
-         .command        = msp_command,
+ 	.id             = I2C_DRIVERID_MSP3400,
+ 	.attach_adapter = msp_probe,
+ 	.detach_client  = msp_detach,
+ 	.command        = msp_command,
  	.driver = {
 +		.owner   = THIS_MODULE,
 +		.name    = "i2c msp3400 driver",
@@ -381,7 +381,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.detach_client  = saa5249_detach,
 --- gregkh-2.6.orig/drivers/media/video/saa6588.c
 +++ gregkh-2.6/drivers/media/video/saa6588.c
-@@ -496,8 +496,10 @@ static int saa6588_command(struct i2c_cl
+@@ -495,8 +495,10 @@ static int saa6588_command(struct i2c_cl
  /* ----------------------------------------------------------------------- */
  
  static struct i2c_driver driver = {
@@ -544,27 +544,27 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
 --- gregkh-2.6.orig/drivers/media/video/saa7134/saa6752hs.c
 +++ gregkh-2.6/drivers/media/video/saa7134/saa6752hs.c
-@@ -596,8 +596,10 @@ saa6752hs_command(struct i2c_client *cli
+@@ -597,8 +597,10 @@ saa6752hs_command(struct i2c_client *cli
  /* ----------------------------------------------------------------------- */
  
  static struct i2c_driver driver = {
 -	.owner          = THIS_MODULE,
--        .name           = "i2c saa6752hs MPEG encoder",
+-	.name           = "i2c saa6752hs MPEG encoder",
 +	.driver = {
 +		.owner  = THIS_MODULE,
 +		.name   = "i2c saa6752hs MPEG encoder",
 +	},
-         .id             = I2C_DRIVERID_SAA6752HS,
-         .attach_adapter = saa6752hs_probe,
-         .detach_client  = saa6752hs_detach,
+ 	.id             = I2C_DRIVERID_SAA6752HS,
+ 	.attach_adapter = saa6752hs_probe,
+ 	.detach_client  = saa6752hs_detach,
 --- gregkh-2.6.orig/drivers/media/video/saa7134/saa7134-i2c.c
 +++ gregkh-2.6/drivers/media/video/saa7134/saa7134-i2c.c
 @@ -333,7 +333,7 @@ static int attach_inform(struct i2c_clie
  	struct tuner_setup tun_setup;
  
  	d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
--		 client->driver->name, client->addr, client->name);
-+		 client->driver->driver.name, client->addr, client->name);
+-		client->driver->name, client->addr, client->name);
++		client->driver->driver.name, client->addr, client->name);
  
  	/* Am I an i2c remote control? */
  
@@ -654,19 +654,19 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.detach_client  = tda9875_detach,
 --- gregkh-2.6.orig/drivers/media/video/tda9887.c
 +++ gregkh-2.6/drivers/media/video/tda9887.c
-@@ -818,13 +818,13 @@ static int tda9887_resume(struct device 
+@@ -819,13 +819,13 @@ static int tda9887_resume(struct device 
  /* ----------------------------------------------------------------------- */
  
  static struct i2c_driver driver = {
 -	.owner          = THIS_MODULE,
--        .name           = "i2c tda9887 driver",
-         .id             = -1, /* FIXME */
-         .attach_adapter = tda9887_probe,
-         .detach_client  = tda9887_detach,
-         .command        = tda9887_command,
+-	.name           = "i2c tda9887 driver",
+ 	.id             = -1, /* FIXME */
+ 	.attach_adapter = tda9887_probe,
+ 	.detach_client  = tda9887_detach,
+ 	.command        = tda9887_command,
  	.driver = {
 +		.owner   = THIS_MODULE,
-+        	.name    = "i2c tda9887 driver",
++		.name    = "i2c tda9887 driver",
  		.suspend = tda9887_suspend,
  		.resume  = tda9887_resume,
  	},
@@ -759,7 +759,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.detach_client   = chip_detach,
 --- gregkh-2.6.orig/drivers/media/video/tveeprom.c
 +++ gregkh-2.6/drivers/media/video/tveeprom.c
-@@ -777,8 +777,10 @@ tveeprom_detach_client (struct i2c_clien
+@@ -778,8 +778,10 @@ tveeprom_detach_client (struct i2c_clien
  }
  
  static struct i2c_driver i2c_driver_tveeprom = {
@@ -792,7 +792,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.attach_adapter  = tvmixer_adapters,
 --- gregkh-2.6.orig/drivers/media/video/tvp5150.c
 +++ gregkh-2.6/drivers/media/video/tvp5150.c
-@@ -801,8 +801,10 @@ static int tvp5150_detach_client(struct 
+@@ -800,8 +800,10 @@ static int tvp5150_detach_client(struct 
  /* ----------------------------------------------------------------------- */
  
  static struct i2c_driver driver = {