pci patches and refresh

3 files changed, 1162 insertions, 3 deletions

diff --git a/i2c/i2c-dev-dynamic_class.patch b/i2c/i2c-dev-dynamic_class.patch
index e6802fe54d8e72..9eb896de9f8338 100644
--- a/i2c/i2c-dev-dynamic_class.patch
+++ b/i2c/i2c-dev-dynamic_class.patch
@@ -1,3 +1,15 @@
+From foo@baz Tue Dec  6 15:35:16 2005
+Date: Tue, 6 Dec 2005 15:33:15 -0800
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Subject: I2C: move i2c-dev to use dynamic class devices
+
+i2c-dev doesn't use the reference counting logic of struct class_device so move
+it to the dynamic method.  This makes the code paths simpler and the driver
+smaller.
+
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+Cc: Jean Delvare <khali@linux-fr.org>
 ---
  drivers/i2c/i2c-dev.c |   50 ++++++++++++++++++++------------------------------
  1 file changed, 20 insertions(+), 30 deletions(-)
@@ -92,7 +104,7 @@
  	kfree(i2c_dev);
  
  	pr_debug("i2c-dev: adapter [%s] unregistered\n", adap->name);
-@@ -508,8 +498,8 @@ static int __init i2c_dev_init(void)
+@@ -507,8 +497,8 @@ static int __init i2c_dev_init(void)
  	if (res)
  		goto out;
  
@@ -103,7 +115,7 @@
  		goto out_unreg_chrdev;
  
  	res = i2c_add_driver(&i2cdev_driver);
-@@ -519,7 +509,7 @@ static int __init i2c_dev_init(void)
+@@ -518,7 +508,7 @@ static int __init i2c_dev_init(void)
  	return 0;
  
  out_unreg_class:
@@ -112,7 +124,7 @@
  out_unreg_chrdev:
  	unregister_chrdev(I2C_MAJOR, "i2c");
  out:
-@@ -530,7 +520,7 @@ out:
+@@ -529,7 +519,7 @@ out:
  static void __exit i2c_dev_exit(void)
  {
  	i2c_del_driver(&i2cdev_driver);
diff --git a/i2c/i2c-driver-owner-cleanup-01.patch b/i2c/i2c-driver-owner-cleanup-01.patch
new file mode 100644
index 00000000000000..41e1b264328081
--- /dev/null
+++ b/i2c/i2c-driver-owner-cleanup-01.patch
@@ -0,0 +1,72 @@
+From foo@baz Tue Dec  6 15:35:16 2005
+Date: Tue, 6 Dec 2005 15:33:15 -0800
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Subject: I2C: Make i2c_add_driver automatically set the proper module owner
+
+
+This prevents i2c drivers from messing up and forgetting to set the
+module owner of their driver.  It also reduces the size of their drivers
+by one line :)
+
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+Cc: Jean Delvare <khali@linux-fr.org>
+
+---
+ drivers/i2c/i2c-core.c |    5 +++--
+ include/linux/i2c.h    |    7 ++++++-
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+--- gregkh-2.6.orig/drivers/i2c/i2c-core.c
++++ gregkh-2.6/drivers/i2c/i2c-core.c
+@@ -287,7 +287,7 @@ int i2c_del_adapter(struct i2c_adapter *
+  * chips.
+  */
+ 
+-int i2c_add_driver(struct i2c_driver *driver)
++int i2c_register_driver(struct module *owner, struct i2c_driver *driver)
+ {
+ 	struct list_head   *item;
+ 	struct i2c_adapter *adapter;
+@@ -296,6 +296,7 @@ int i2c_add_driver(struct i2c_driver *dr
+ 	down(&core_lists);
+ 
+ 	/* add the driver to the list of i2c drivers in the driver core */
++	driver->driver.owner = owner;
+ 	driver->driver.bus = &i2c_bus_type;
+ 	driver->driver.probe = i2c_device_probe;
+ 	driver->driver.remove = i2c_device_remove;
+@@ -319,6 +320,7 @@ int i2c_add_driver(struct i2c_driver *dr
+ 	up(&core_lists);
+ 	return res;
+ }
++EXPORT_SYMBOL(i2c_register_driver);
+ 
+ int i2c_del_driver(struct i2c_driver *driver)
+ {
+@@ -1132,7 +1134,6 @@ EXPORT_SYMBOL_GPL(i2c_bus_type);
+ 
+ EXPORT_SYMBOL(i2c_add_adapter);
+ EXPORT_SYMBOL(i2c_del_adapter);
+-EXPORT_SYMBOL(i2c_add_driver);
+ EXPORT_SYMBOL(i2c_del_driver);
+ EXPORT_SYMBOL(i2c_attach_client);
+ EXPORT_SYMBOL(i2c_detach_client);
+--- gregkh-2.6.orig/include/linux/i2c.h
++++ gregkh-2.6/include/linux/i2c.h
+@@ -291,9 +291,14 @@ struct i2c_client_address_data {
+ extern int i2c_add_adapter(struct i2c_adapter *);
+ extern int i2c_del_adapter(struct i2c_adapter *);
+ 
+-extern int i2c_add_driver(struct i2c_driver *);
++extern int i2c_register_driver(struct module *, struct i2c_driver *);
+ extern int i2c_del_driver(struct i2c_driver *);
+ 
++static inline int i2c_add_driver(struct i2c_driver *driver)
++{
++	return i2c_register_driver(THIS_MODULE, driver);
++}
++
+ extern int i2c_attach_client(struct i2c_client *);
+ extern int i2c_detach_client(struct i2c_client *);
+ 
diff --git a/i2c/i2c-driver-owner-cleanup-02.patch b/i2c/i2c-driver-owner-cleanup-02.patch
new file mode 100644
index 00000000000000..393618d8c0d9e8
--- /dev/null
+++ b/i2c/i2c-driver-owner-cleanup-02.patch
@@ -0,0 +1,1075 @@
+From foo@baz Tue Dec  6 15:35:16 2005
+Date: Tue, 6 Dec 2005 15:33:15 -0800
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Subject: I2C: Remove .owner setting from i2c_driver as it's no longer needed
+
+Now that i2c_add_driver() doesn't need the module owner to be set by
+hand, we can delete it from the drivers.  This patch catches all of the
+drivers that I found in the current tree (if a driver sets the .owner by
+hand, it's not a problem, just not needed.)
+
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+Cc: Jean Delvare <khali@linux-fr.org>
+
+---
+ arch/arm/mach-pxa/akita-ioexp.c                |    1 -
+ drivers/acorn/char/pcf8583.c                   |    1 -
+ drivers/hwmon/adm1021.c                        |    1 -
+ drivers/hwmon/adm1025.c                        |    1 -
+ drivers/hwmon/adm1026.c                        |    1 -
+ drivers/hwmon/adm1031.c                        |    1 -
+ drivers/hwmon/adm9240.c                        |    1 -
+ drivers/hwmon/asb100.c                         |    1 -
+ drivers/hwmon/atxp1.c                          |    1 -
+ drivers/hwmon/ds1621.c                         |    1 -
+ drivers/hwmon/fscher.c                         |    1 -
+ drivers/hwmon/fscpos.c                         |    1 -
+ drivers/hwmon/gl518sm.c                        |    1 -
+ drivers/hwmon/gl520sm.c                        |    1 -
+ drivers/hwmon/it87.c                           |    2 --
+ drivers/hwmon/lm63.c                           |    1 -
+ drivers/hwmon/lm75.c                           |    1 -
+ drivers/hwmon/lm77.c                           |    1 -
+ drivers/hwmon/lm78.c                           |    2 --
+ drivers/hwmon/lm80.c                           |    1 -
+ drivers/hwmon/lm83.c                           |    1 -
+ drivers/hwmon/lm85.c                           |    1 -
+ drivers/hwmon/lm87.c                           |    1 -
+ drivers/hwmon/lm90.c                           |    1 -
+ drivers/hwmon/lm92.c                           |    1 -
+ drivers/hwmon/max1619.c                        |    1 -
+ drivers/hwmon/pc87360.c                        |    1 -
+ drivers/hwmon/sis5595.c                        |    1 -
+ drivers/hwmon/smsc47b397.c                     |    1 -
+ drivers/hwmon/smsc47m1.c                       |    1 -
+ drivers/hwmon/via686a.c                        |    1 -
+ drivers/hwmon/vt8231.c                         |    1 -
+ drivers/hwmon/w83627ehf.c                      |    1 -
+ drivers/hwmon/w83627hf.c                       |    1 -
+ drivers/hwmon/w83781d.c                        |    2 --
+ drivers/hwmon/w83792d.c                        |    1 -
+ drivers/hwmon/w83l785ts.c                      |    1 -
+ drivers/i2c/chips/ds1337.c                     |    1 -
+ drivers/i2c/chips/ds1374.c                     |    1 -
+ drivers/i2c/chips/eeprom.c                     |    1 -
+ drivers/i2c/chips/isp1301_omap.c               |    1 -
+ drivers/i2c/chips/m41t00.c                     |    1 -
+ drivers/i2c/chips/max6875.c                    |    1 -
+ drivers/i2c/chips/pca9539.c                    |    1 -
+ drivers/i2c/chips/pcf8574.c                    |    1 -
+ drivers/i2c/chips/pcf8591.c                    |    1 -
+ drivers/i2c/chips/rtc8564.c                    |    1 -
+ drivers/i2c/chips/tps65010.c                   |    1 -
+ drivers/i2c/chips/x1205.c                      |    1 -
+ drivers/i2c/i2c-dev.c                          |    1 -
+ drivers/macintosh/therm_adt746x.c              |    1 -
+ drivers/macintosh/therm_windtunnel.c           |    1 -
+ drivers/macintosh/windfarm_lm75_sensor.c       |    1 -
+ drivers/media/video/adv7170.c                  |    1 -
+ drivers/media/video/adv7175.c                  |    1 -
+ drivers/media/video/bt819.c                    |    1 -
+ drivers/media/video/bt832.c                    |    1 -
+ drivers/media/video/bt856.c                    |    1 -
+ drivers/media/video/cs53l32a.c                 |    1 -
+ drivers/media/video/cx25840/cx25840-core.c     |    1 -
+ drivers/media/video/indycam.c                  |    1 -
+ drivers/media/video/ir-kbd-i2c.c               |    1 -
+ drivers/media/video/msp3400.c                  |    1 -
+ drivers/media/video/ovcamchip/ovcamchip_core.c |    1 -
+ drivers/media/video/saa5246a.c                 |    1 -
+ drivers/media/video/saa5249.c                  |    1 -
+ drivers/media/video/saa6588.c                  |    1 -
+ drivers/media/video/saa7110.c                  |    1 -
+ drivers/media/video/saa7111.c                  |    1 -
+ drivers/media/video/saa7114.c                  |    1 -
+ drivers/media/video/saa7115.c                  |    1 -
+ drivers/media/video/saa711x.c                  |    1 -
+ drivers/media/video/saa7127.c                  |    1 -
+ drivers/media/video/saa7134/saa6752hs.c        |    1 -
+ drivers/media/video/saa7185.c                  |    1 -
+ drivers/media/video/saa7191.c                  |    1 -
+ drivers/media/video/tda7432.c                  |    1 -
+ drivers/media/video/tda9840.c                  |    1 -
+ drivers/media/video/tda9875.c                  |    1 -
+ drivers/media/video/tda9887.c                  |    1 -
+ drivers/media/video/tea6415c.c                 |    1 -
+ drivers/media/video/tea6420.c                  |    1 -
+ drivers/media/video/tuner-3036.c               |    1 -
+ drivers/media/video/tuner-core.c               |    1 -
+ drivers/media/video/tvaudio.c                  |    1 -
+ drivers/media/video/tveeprom.c                 |    1 -
+ drivers/media/video/tvmixer.c                  |    1 -
+ drivers/media/video/tvp5150.c                  |    1 -
+ drivers/media/video/vpx3220.c                  |    1 -
+ drivers/media/video/wm8775.c                   |    1 -
+ drivers/video/matrox/matroxfb_maven.c          |    1 -
+ sound/oss/dmasound/dac3550a.c                  |    1 -
+ sound/oss/dmasound/tas_common.c                |    1 -
+ sound/ppc/keywest.c                            |    1 -
+ 94 files changed, 97 deletions(-)
+
+--- gregkh-2.6.orig/drivers/hwmon/adm1021.c
++++ gregkh-2.6/drivers/hwmon/adm1021.c
+@@ -127,7 +127,6 @@ static int read_only;
+ /* This is the driver that will be inserted */
+ static struct i2c_driver adm1021_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "adm1021",
+ 	},
+ 	.id		= I2C_DRIVERID_ADM1021,
+--- gregkh-2.6.orig/drivers/hwmon/adm1025.c
++++ gregkh-2.6/drivers/hwmon/adm1025.c
+@@ -119,7 +119,6 @@ static struct adm1025_data *adm1025_upda
+ 
+ static struct i2c_driver adm1025_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "adm1025",
+ 	},
+ 	.id		= I2C_DRIVERID_ADM1025,
+--- gregkh-2.6.orig/drivers/hwmon/adm1026.c
++++ gregkh-2.6/drivers/hwmon/adm1026.c
+@@ -309,7 +309,6 @@ static void adm1026_init_client(struct i
+ 
+ static struct i2c_driver adm1026_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "adm1026",
+ 	},
+ 	.attach_adapter = adm1026_attach_adapter,
+--- gregkh-2.6.orig/drivers/hwmon/adm1031.c
++++ gregkh-2.6/drivers/hwmon/adm1031.c
+@@ -106,7 +106,6 @@ static struct adm1031_data *adm1031_upda
+ /* This is the driver that will be inserted */
+ static struct i2c_driver adm1031_driver = {
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "adm1031",
+ 	},
+ 	.attach_adapter = adm1031_attach_adapter,
+--- gregkh-2.6.orig/drivers/hwmon/adm9240.c
++++ gregkh-2.6/drivers/hwmon/adm9240.c
+@@ -138,7 +138,6 @@ static struct adm9240_data *adm9240_upda
+ /* driver data */
+ static struct i2c_driver adm9240_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "adm9240",
+ 	},
+ 	.id		= I2C_DRIVERID_ADM9240,
+--- gregkh-2.6.orig/drivers/hwmon/asb100.c
++++ gregkh-2.6/drivers/hwmon/asb100.c
+@@ -218,7 +218,6 @@ static void asb100_init_client(struct i2
+ 
+ static struct i2c_driver asb100_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "asb100",
+ 	},
+ 	.id		= I2C_DRIVERID_ASB100,
+--- gregkh-2.6.orig/drivers/hwmon/atxp1.c
++++ gregkh-2.6/drivers/hwmon/atxp1.c
+@@ -51,7 +51,6 @@ static int atxp1_detect(struct i2c_adapt
+ 
+ static struct i2c_driver atxp1_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "atxp1",
+ 	},
+ 	.attach_adapter = atxp1_attach_adapter,
+--- gregkh-2.6.orig/drivers/hwmon/ds1621.c
++++ gregkh-2.6/drivers/hwmon/ds1621.c
+@@ -90,7 +90,6 @@ static struct ds1621_data *ds1621_update
+ /* This is the driver that will be inserted */
+ static struct i2c_driver ds1621_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "ds1621",
+ 	},
+ 	.id		= I2C_DRIVERID_DS1621,
+--- gregkh-2.6.orig/drivers/hwmon/fscher.c
++++ gregkh-2.6/drivers/hwmon/fscher.c
+@@ -119,7 +119,6 @@ static int fscher_write_value(struct i2c
+  
+ static struct i2c_driver fscher_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "fscher",
+ 	},
+ 	.id		= I2C_DRIVERID_FSCHER,
+--- gregkh-2.6.orig/drivers/hwmon/fscpos.c
++++ gregkh-2.6/drivers/hwmon/fscpos.c
+@@ -101,7 +101,6 @@ static void reset_fan_alarm(struct i2c_c
+  */
+ static struct i2c_driver fscpos_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "fscpos",
+ 	},
+ 	.id		= I2C_DRIVERID_FSCPOS,
+--- gregkh-2.6.orig/drivers/hwmon/gl518sm.c
++++ gregkh-2.6/drivers/hwmon/gl518sm.c
+@@ -152,7 +152,6 @@ static struct gl518_data *gl518_update_d
+ /* This is the driver that will be inserted */
+ static struct i2c_driver gl518_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "gl518sm",
+ 	},
+ 	.id		= I2C_DRIVERID_GL518,
+--- gregkh-2.6.orig/drivers/hwmon/gl520sm.c
++++ gregkh-2.6/drivers/hwmon/gl520sm.c
+@@ -110,7 +110,6 @@ static struct gl520_data *gl520_update_d
+ /* Driver data */
+ static struct i2c_driver gl520_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "gl520sm",
+ 	},
+ 	.id		= I2C_DRIVERID_GL520,
+--- gregkh-2.6.orig/drivers/hwmon/it87.c
++++ gregkh-2.6/drivers/hwmon/it87.c
+@@ -235,7 +235,6 @@ static void it87_init_client(struct i2c_
+ 
+ static struct i2c_driver it87_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "it87",
+ 	},
+ 	.id		= I2C_DRIVERID_IT87,
+@@ -245,7 +244,6 @@ static struct i2c_driver it87_driver = {
+ 
+ static struct i2c_driver it87_isa_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "it87-isa",
+ 	},
+ 	.attach_adapter	= it87_isa_attach_adapter,
+--- gregkh-2.6.orig/drivers/hwmon/lm63.c
++++ gregkh-2.6/drivers/hwmon/lm63.c
+@@ -140,7 +140,6 @@ static void lm63_init_client(struct i2c_
+ 
+ static struct i2c_driver lm63_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "lm63",
+ 	},
+ 	.attach_adapter	= lm63_attach_adapter,
+--- gregkh-2.6.orig/drivers/hwmon/lm75.c
++++ gregkh-2.6/drivers/hwmon/lm75.c
+@@ -67,7 +67,6 @@ static struct lm75_data *lm75_update_dev
+ /* This is the driver that will be inserted */
+ static struct i2c_driver lm75_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "lm75",
+ 	},
+ 	.id		= I2C_DRIVERID_LM75,
+--- gregkh-2.6.orig/drivers/hwmon/lm77.c
++++ gregkh-2.6/drivers/hwmon/lm77.c
+@@ -75,7 +75,6 @@ static struct lm77_data *lm77_update_dev
+ /* This is the driver that will be inserted */
+ static struct i2c_driver lm77_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "lm77",
+ 	},
+ 	.attach_adapter = lm77_attach_adapter,
+--- gregkh-2.6.orig/drivers/hwmon/lm78.c
++++ gregkh-2.6/drivers/hwmon/lm78.c
+@@ -165,7 +165,6 @@ static void lm78_init_client(struct i2c_
+ 
+ static struct i2c_driver lm78_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "lm78",
+ 	},
+ 	.id		= I2C_DRIVERID_LM78,
+@@ -175,7 +174,6 @@ static struct i2c_driver lm78_driver = {
+ 
+ static struct i2c_driver lm78_isa_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "lm78-isa",
+ 	},
+ 	.attach_adapter	= lm78_isa_attach_adapter,
+--- gregkh-2.6.orig/drivers/hwmon/lm80.c
++++ gregkh-2.6/drivers/hwmon/lm80.c
+@@ -144,7 +144,6 @@ static int lm80_write_value(struct i2c_c
+ 
+ static struct i2c_driver lm80_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "lm80",
+ 	},
+ 	.id		= I2C_DRIVERID_LM80,
+--- gregkh-2.6.orig/drivers/hwmon/lm83.c
++++ gregkh-2.6/drivers/hwmon/lm83.c
+@@ -125,7 +125,6 @@ static struct lm83_data *lm83_update_dev
+  
+ static struct i2c_driver lm83_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "lm83",
+ 	},
+ 	.id		= I2C_DRIVERID_LM83,
+--- gregkh-2.6.orig/drivers/hwmon/lm85.c
++++ gregkh-2.6/drivers/hwmon/lm85.c
+@@ -381,7 +381,6 @@ static void lm85_init_client(struct i2c_
+ 
+ static struct i2c_driver lm85_driver = {
+ 	.driver = {
+-		.owner  = THIS_MODULE,
+ 		.name   = "lm85",
+ 	},
+ 	.id             = I2C_DRIVERID_LM85,
+--- gregkh-2.6.orig/drivers/hwmon/lm87.c
++++ gregkh-2.6/drivers/hwmon/lm87.c
+@@ -162,7 +162,6 @@ static struct lm87_data *lm87_update_dev
+ 
+ static struct i2c_driver lm87_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "lm87",
+ 	},
+ 	.id		= I2C_DRIVERID_LM87,
+--- gregkh-2.6.orig/drivers/hwmon/lm90.c
++++ gregkh-2.6/drivers/hwmon/lm90.c
+@@ -187,7 +187,6 @@ static struct lm90_data *lm90_update_dev
+ 
+ static struct i2c_driver lm90_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "lm90",
+ 	},
+ 	.id		= I2C_DRIVERID_LM90,
+--- gregkh-2.6.orig/drivers/hwmon/lm92.c
++++ gregkh-2.6/drivers/hwmon/lm92.c
+@@ -411,7 +411,6 @@ static int lm92_detach_client(struct i2c
+ 
+ static struct i2c_driver lm92_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "lm92",
+ 	},
+ 	.id		= I2C_DRIVERID_LM92,
+--- gregkh-2.6.orig/drivers/hwmon/max1619.c
++++ gregkh-2.6/drivers/hwmon/max1619.c
+@@ -91,7 +91,6 @@ static struct max1619_data *max1619_upda
+ 
+ static struct i2c_driver max1619_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "max1619",
+ 	},
+ 	.attach_adapter	= max1619_attach_adapter,
+--- gregkh-2.6.orig/drivers/hwmon/pc87360.c
++++ gregkh-2.6/drivers/hwmon/pc87360.c
+@@ -237,7 +237,6 @@ static struct pc87360_data *pc87360_upda
+ 
+ static struct i2c_driver pc87360_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "pc87360",
+ 	},
+ 	.attach_adapter	= pc87360_detect,
+--- gregkh-2.6.orig/drivers/hwmon/sis5595.c
++++ gregkh-2.6/drivers/hwmon/sis5595.c
+@@ -199,7 +199,6 @@ static void sis5595_init_client(struct i
+ 
+ static struct i2c_driver sis5595_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "sis5595",
+ 	},
+ 	.attach_adapter	= sis5595_detect,
+--- gregkh-2.6.orig/drivers/hwmon/smsc47b397.c
++++ gregkh-2.6/drivers/hwmon/smsc47b397.c
+@@ -227,7 +227,6 @@ static int smsc47b397_detect(struct i2c_
+ 
+ static struct i2c_driver smsc47b397_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "smsc47b397",
+ 	},
+ 	.attach_adapter	= smsc47b397_detect,
+--- gregkh-2.6.orig/drivers/hwmon/smsc47m1.c
++++ gregkh-2.6/drivers/hwmon/smsc47m1.c
+@@ -127,7 +127,6 @@ static struct smsc47m1_data *smsc47m1_up
+ 
+ static struct i2c_driver smsc47m1_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "smsc47m1",
+ 	},
+ 	.attach_adapter	= smsc47m1_detect,
+--- gregkh-2.6.orig/drivers/hwmon/via686a.c
++++ gregkh-2.6/drivers/hwmon/via686a.c
+@@ -573,7 +573,6 @@ static DEVICE_ATTR(alarms, S_IRUGO, show
+    smbus_driver and isa_driver, and clients could be of either kind */
+ static struct i2c_driver via686a_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "via686a",
+ 	},
+ 	.attach_adapter	= via686a_detect,
+--- gregkh-2.6.orig/drivers/hwmon/vt8231.c
++++ gregkh-2.6/drivers/hwmon/vt8231.c
+@@ -586,7 +586,6 @@ static DEVICE_ATTR(alarms, S_IRUGO, show
+ 
+ static struct i2c_driver vt8231_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "vt8231",
+ 	},
+ 	.attach_adapter	= vt8231_detect,
+--- gregkh-2.6.orig/drivers/hwmon/w83627ehf.c
++++ gregkh-2.6/drivers/hwmon/w83627ehf.c
+@@ -786,7 +786,6 @@ static int w83627ehf_detach_client(struc
+ 
+ static struct i2c_driver w83627ehf_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "w83627ehf",
+ 	},
+ 	.attach_adapter	= w83627ehf_detect,
+--- gregkh-2.6.orig/drivers/hwmon/w83627hf.c
++++ gregkh-2.6/drivers/hwmon/w83627hf.c
+@@ -333,7 +333,6 @@ static void w83627hf_init_client(struct 
+ 
+ static struct i2c_driver w83627hf_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "w83627hf",
+ 	},
+ 	.attach_adapter	= w83627hf_detect,
+--- gregkh-2.6.orig/drivers/hwmon/w83781d.c
++++ gregkh-2.6/drivers/hwmon/w83781d.c
+@@ -270,7 +270,6 @@ static void w83781d_init_client(struct i
+ 
+ static struct i2c_driver w83781d_driver = {
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "w83781d",
+ 	},
+ 	.id = I2C_DRIVERID_W83781D,
+@@ -280,7 +279,6 @@ static struct i2c_driver w83781d_driver 
+ 
+ static struct i2c_driver w83781d_isa_driver = {
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "w83781d-isa",
+ 	},
+ 	.attach_adapter = w83781d_isa_attach_adapter,
+--- gregkh-2.6.orig/drivers/hwmon/w83792d.c
++++ gregkh-2.6/drivers/hwmon/w83792d.c
+@@ -318,7 +318,6 @@ static void w83792d_init_client(struct i
+ 
+ static struct i2c_driver w83792d_driver = {
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "w83792d",
+ 	},
+ 	.attach_adapter = w83792d_attach_adapter,
+--- gregkh-2.6.orig/drivers/hwmon/w83l785ts.c
++++ gregkh-2.6/drivers/hwmon/w83l785ts.c
+@@ -93,7 +93,6 @@ static struct w83l785ts_data *w83l785ts_
+  
+ static struct i2c_driver w83l785ts_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "w83l785ts",
+ 	},
+ 	.id		= I2C_DRIVERID_W83L785TS,
+--- gregkh-2.6.orig/drivers/i2c/chips/ds1337.c
++++ gregkh-2.6/drivers/i2c/chips/ds1337.c
+@@ -53,7 +53,6 @@ static int ds1337_command(struct i2c_cli
+  */
+ static struct i2c_driver ds1337_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "ds1337",
+ 	},
+ 	.attach_adapter	= ds1337_attach_adapter,
+--- gregkh-2.6.orig/drivers/i2c/chips/ds1374.c
++++ gregkh-2.6/drivers/i2c/chips/ds1374.c
+@@ -233,7 +233,6 @@ static int ds1374_detach(struct i2c_clie
+ 
+ static struct i2c_driver ds1374_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= DS1374_DRV_NAME,
+ 	},
+ 	.id = I2C_DRIVERID_DS1374,
+--- gregkh-2.6.orig/drivers/i2c/chips/eeprom.c
++++ gregkh-2.6/drivers/i2c/chips/eeprom.c
+@@ -69,7 +69,6 @@ static int eeprom_detach_client(struct i
+ /* This is the driver that will be inserted */
+ static struct i2c_driver eeprom_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "eeprom",
+ 	},
+ 	.id		= I2C_DRIVERID_EEPROM,
+--- gregkh-2.6.orig/drivers/i2c/chips/isp1301_omap.c
++++ gregkh-2.6/drivers/i2c/chips/isp1301_omap.c
+@@ -1633,7 +1633,6 @@ static int isp1301_scan_bus(struct i2c_a
+ 
+ static struct i2c_driver isp1301_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "isp1301_omap",
+ 	},
+ 	.id		= 1301,		/* FIXME "official", i2c-ids.h */
+--- gregkh-2.6.orig/drivers/i2c/chips/m41t00.c
++++ gregkh-2.6/drivers/i2c/chips/m41t00.c
+@@ -212,7 +212,6 @@ m41t00_detach(struct i2c_client *client)
+ 
+ static struct i2c_driver m41t00_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= M41T00_DRV_NAME,
+ 	},
+ 	.id		= I2C_DRIVERID_STM41T00,
+--- gregkh-2.6.orig/drivers/i2c/chips/max6875.c
++++ gregkh-2.6/drivers/i2c/chips/max6875.c
+@@ -68,7 +68,6 @@ static int max6875_detach_client(struct 
+ /* This is the driver that will be inserted */
+ static struct i2c_driver max6875_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "max6875",
+ 	},
+ 	.attach_adapter	= max6875_attach_adapter,
+--- gregkh-2.6.orig/drivers/i2c/chips/pca9539.c
++++ gregkh-2.6/drivers/i2c/chips/pca9539.c
+@@ -39,7 +39,6 @@ static int pca9539_detach_client(struct 
+ /* This is the driver that will be inserted */
+ static struct i2c_driver pca9539_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "pca9539",
+ 	},
+ 	.attach_adapter	= pca9539_attach_adapter,
+--- gregkh-2.6.orig/drivers/i2c/chips/pcf8574.c
++++ gregkh-2.6/drivers/i2c/chips/pcf8574.c
+@@ -66,7 +66,6 @@ static void pcf8574_init_client(struct i
+ /* This is the driver that will be inserted */
+ static struct i2c_driver pcf8574_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "pcf8574",
+ 	},
+ 	.id		= I2C_DRIVERID_PCF8574,
+--- gregkh-2.6.orig/drivers/i2c/chips/pcf8591.c
++++ gregkh-2.6/drivers/i2c/chips/pcf8591.c
+@@ -89,7 +89,6 @@ static int pcf8591_read_channel(struct d
+ /* This is the driver that will be inserted */
+ static struct i2c_driver pcf8591_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "pcf8591",
+ 	},
+ 	.id		= I2C_DRIVERID_PCF8591,
+--- gregkh-2.6.orig/drivers/i2c/chips/rtc8564.c
++++ gregkh-2.6/drivers/i2c/chips/rtc8564.c
+@@ -359,7 +359,6 @@ rtc8564_command(struct i2c_client *clien
+ 
+ static struct i2c_driver rtc8564_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "RTC8564",
+ 	},
+ 	.id		= I2C_DRIVERID_RTC8564,
+--- gregkh-2.6.orig/drivers/i2c/chips/tps65010.c
++++ gregkh-2.6/drivers/i2c/chips/tps65010.c
+@@ -638,7 +638,6 @@ static int __init tps65010_scan_bus(stru
+ 
+ static struct i2c_driver tps65010_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "tps65010",
+ 	},
+ 	.attach_adapter	= tps65010_scan_bus,
+--- gregkh-2.6.orig/drivers/i2c/chips/x1205.c
++++ gregkh-2.6/drivers/i2c/chips/x1205.c
+@@ -106,7 +106,6 @@ static int x1205_command(struct i2c_clie
+ 
+ static struct i2c_driver x1205_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "x1205",
+ 	},
+ 	.attach_adapter = &x1205_attach,
+--- gregkh-2.6.orig/drivers/i2c/i2c-dev.c
++++ gregkh-2.6/drivers/i2c/i2c-dev.c
+@@ -482,7 +482,6 @@ static int i2cdev_command(struct i2c_cli
+ 
+ static struct i2c_driver i2cdev_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "dev_driver",
+ 	},
+ 	.id		= I2C_DRIVERID_I2CDEV,
+--- gregkh-2.6.orig/sound/oss/dmasound/dac3550a.c
++++ gregkh-2.6/sound/oss/dmasound/dac3550a.c
+@@ -42,7 +42,6 @@ static int daca_detach_client(struct i2c
+ 
+ struct i2c_driver daca_driver = {  
+ 	.driver = {
+-		.owner		= THIS_MODULE,
+ 		.name		= "DAC3550A driver  V " DACA_VERSION,
+ 	},
+ 	.id			= I2C_DRIVERID_DACA,
+--- gregkh-2.6.orig/sound/oss/dmasound/tas_common.c
++++ gregkh-2.6/sound/oss/dmasound/tas_common.c
+@@ -48,7 +48,6 @@ static int tas_detach_client(struct i2c_
+ 
+ struct i2c_driver tas_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "tas",
+ 	},
+ 	.attach_adapter	= tas_attach_adapter,
+--- gregkh-2.6.orig/arch/arm/mach-pxa/akita-ioexp.c
++++ gregkh-2.6/arch/arm/mach-pxa/akita-ioexp.c
+@@ -125,7 +125,6 @@ static int max7310_detach_client(struct 
+ 
+ static struct i2c_driver max7310_i2c_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "akita-max7310",
+ 	},
+ 	.id		= I2C_DRIVERID_AKITAIOEXP,
+--- gregkh-2.6.orig/drivers/acorn/char/pcf8583.c
++++ gregkh-2.6/drivers/acorn/char/pcf8583.c
+@@ -258,7 +258,6 @@ pcf8583_command(struct i2c_client *clien
+ 
+ static struct i2c_driver pcf8583_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "PCF8583",
+ 	},
+ 	.id		= I2C_DRIVERID_PCF8583,
+--- gregkh-2.6.orig/drivers/macintosh/therm_adt746x.c
++++ gregkh-2.6/drivers/macintosh/therm_adt746x.c
+@@ -172,7 +172,6 @@ detach_thermostat(struct i2c_adapter *ad
+ 
+ static struct i2c_driver thermostat_driver = {  
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "therm_adt746x",
+ 	},
+ 	.attach_adapter	= attach_thermostat,
+--- gregkh-2.6.orig/drivers/macintosh/therm_windtunnel.c
++++ gregkh-2.6/drivers/macintosh/therm_windtunnel.c
+@@ -355,7 +355,6 @@ do_detach( struct i2c_client *client )
+ 
+ static struct i2c_driver g4fan_driver = {  
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "therm_windtunnel",
+ 	},
+ 	.id		= I2C_DRIVERID_G4FAN,
+--- gregkh-2.6.orig/drivers/macintosh/windfarm_lm75_sensor.c
++++ gregkh-2.6/drivers/macintosh/windfarm_lm75_sensor.c
+@@ -48,7 +48,6 @@ static int wf_lm75_detach(struct i2c_cli
+ 
+ static struct i2c_driver wf_lm75_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "wf_lm75",
+ 	},
+ 	.attach_adapter	= wf_lm75_attach,
+--- gregkh-2.6.orig/drivers/media/video/cx25840/cx25840-core.c
++++ gregkh-2.6/drivers/media/video/cx25840/cx25840-core.c
+@@ -838,7 +838,6 @@ static int cx25840_detach_client(struct 
+ 
+ static struct i2c_driver i2c_driver_cx25840 = {
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "cx25840",
+ 	},
+ 
+--- gregkh-2.6.orig/drivers/media/video/ovcamchip/ovcamchip_core.c
++++ gregkh-2.6/drivers/media/video/ovcamchip/ovcamchip_core.c
+@@ -411,7 +411,6 @@ static int ovcamchip_command(struct i2c_
+ 
+ static struct i2c_driver driver = {
+ 	.driver = {
+-		.owner =	THIS_MODULE,
+ 		.name =		"ovcamchip",
+ 	},
+ 	.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
+ 
+ static struct i2c_driver driver = {
+ 	.driver = {
+-		.owner  = THIS_MODULE,
+ 		.name   = "i2c saa6752hs MPEG encoder",
+ 	},
+         .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
+ 
+ static struct i2c_driver maven_driver={
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "maven",
+ 	},
+ 	.id		= I2C_DRIVERID_MGATVO,
+--- gregkh-2.6.orig/sound/ppc/keywest.c
++++ gregkh-2.6/sound/ppc/keywest.c
+@@ -42,7 +42,6 @@ static int keywest_detach_client(struct 
+ 
+ struct i2c_driver keywest_driver = {  
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "PMac Keywest Audio",
+ 	},
+ 	.id = I2C_DRIVERID_KEYWEST,
+--- gregkh-2.6.orig/drivers/media/video/adv7170.c
++++ gregkh-2.6/drivers/media/video/adv7170.c
+@@ -498,7 +498,6 @@ adv7170_detach_client (struct i2c_client
+ 
+ static struct i2c_driver i2c_driver_adv7170 = {
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "adv7170",	/* name */
+ 	},
+ 
+--- gregkh-2.6.orig/drivers/media/video/adv7175.c
++++ gregkh-2.6/drivers/media/video/adv7175.c
+@@ -548,7 +548,6 @@ adv7175_detach_client (struct i2c_client
+ 
+ static struct i2c_driver i2c_driver_adv7175 = {
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "adv7175",	/* name */
+ 	},
+ 
+--- gregkh-2.6.orig/drivers/media/video/bt819.c
++++ gregkh-2.6/drivers/media/video/bt819.c
+@@ -623,7 +623,6 @@ bt819_detach_client (struct i2c_client *
+ 
+ static struct i2c_driver i2c_driver_bt819 = {
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "bt819",
+ 	},
+ 
+--- gregkh-2.6.orig/drivers/media/video/bt832.c
++++ gregkh-2.6/drivers/media/video/bt832.c
+@@ -231,7 +231,6 @@ bt832_command(struct i2c_client *client,
+ 
+ static struct i2c_driver driver = {
+ 	.driver = {
+-		.owner  = THIS_MODULE,
+ 		.name   = "i2c bt832 driver",
+ 	},
+         .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 *
+ 
+ static struct i2c_driver i2c_driver_bt856 = {
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "bt856",
+ 	},
+ 
+--- gregkh-2.6.orig/drivers/media/video/cs53l32a.c
++++ gregkh-2.6/drivers/media/video/cs53l32a.c
+@@ -217,7 +217,6 @@ static int cs53l32a_detach(struct i2c_cl
+ /* i2c implementation */
+ static struct i2c_driver i2c_driver = {
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "cs53l32a",
+ 	},
+ 	.id = I2C_DRIVERID_CS53L32A,
+--- gregkh-2.6.orig/drivers/media/video/indycam.c
++++ gregkh-2.6/drivers/media/video/indycam.c
+@@ -452,7 +452,6 @@ static int indycam_command(struct i2c_cl
+ 
+ static struct i2c_driver i2c_driver_indycam = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name 	= "indycam",
+ 	},
+ 	.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 *
+ 
+ static struct i2c_driver driver = {
+ 	.driver = {
+-		.owner  = THIS_MODULE,
+ 		.name   = "ir remote kbd driver",
+ 	},
+ 	.id             = I2C_DRIVERID_I2C_IR,
+--- 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,
+ 	.driver = {
+-		.owner   = THIS_MODULE,
+ 		.name    = "i2c msp3400 driver",
+ 		.suspend = msp_suspend,
+ 		.resume  = msp_resume,
+--- gregkh-2.6.orig/drivers/media/video/saa5246a.c
++++ gregkh-2.6/drivers/media/video/saa5246a.c
+@@ -164,7 +164,6 @@ static int saa5246a_command(struct i2c_c
+ static struct i2c_driver i2c_driver_videotext =
+ {
+ 	.driver = {
+-		.owner 	= THIS_MODULE,
+ 		.name 	= IF_NAME,		/* name */
+ 	},
+ 	.id 		= I2C_DRIVERID_SAA5249, /* in i2c.h */
+--- gregkh-2.6.orig/drivers/media/video/saa5249.c
++++ gregkh-2.6/drivers/media/video/saa5249.c
+@@ -237,7 +237,6 @@ static int saa5249_command(struct i2c_cl
+ static struct i2c_driver i2c_driver_videotext = 
+ {
+ 	.driver = {
+-		.owner 	= THIS_MODULE,
+ 		.name 	= IF_NAME,		/* name */
+ 	},
+ 	.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
+ 
+ static struct i2c_driver driver = {
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "i2c saa6588 driver",
+ 	},
+ 	.id = -1,		/* FIXME */
+--- gregkh-2.6.orig/drivers/media/video/saa7110.c
++++ gregkh-2.6/drivers/media/video/saa7110.c
+@@ -587,7 +587,6 @@ saa7110_detach_client (struct i2c_client
+ 
+ static struct i2c_driver i2c_driver_saa7110 = {
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "saa7110",
+ 	},
+ 
+--- gregkh-2.6.orig/drivers/media/video/saa7111.c
++++ gregkh-2.6/drivers/media/video/saa7111.c
+@@ -590,7 +590,6 @@ saa7111_detach_client (struct i2c_client
+ 
+ static struct i2c_driver i2c_driver_saa7111 = {
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "saa7111",
+ 	},
+ 
+--- gregkh-2.6.orig/drivers/media/video/saa7114.c
++++ gregkh-2.6/drivers/media/video/saa7114.c
+@@ -1204,7 +1204,6 @@ saa7114_detach_client (struct i2c_client
+ 
+ static struct i2c_driver i2c_driver_saa7114 = {
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "saa7114",
+ 	},
+ 
+--- gregkh-2.6.orig/drivers/media/video/saa7115.c
++++ gregkh-2.6/drivers/media/video/saa7115.c
+@@ -1355,7 +1355,6 @@ static int saa7115_detach(struct i2c_cli
+ /* i2c implementation */
+ static struct i2c_driver i2c_driver_saa7115 = {
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "saa7115",
+ 	},
+ 	.id = I2C_DRIVERID_SAA711X,
+--- gregkh-2.6.orig/drivers/media/video/saa711x.c
++++ gregkh-2.6/drivers/media/video/saa711x.c
+@@ -565,7 +565,6 @@ saa711x_detach_client (struct i2c_client
+ 
+ static struct i2c_driver i2c_driver_saa711x = {
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "saa711x",
+ 	},
+ 
+--- gregkh-2.6.orig/drivers/media/video/saa7127.c
++++ gregkh-2.6/drivers/media/video/saa7127.c
+@@ -821,7 +821,6 @@ static int saa7127_detach(struct i2c_cli
+ 
+ static struct i2c_driver i2c_driver_saa7127 = {
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "saa7127",
+ 	},
+ 	.id = I2C_DRIVERID_SAA7127,
+--- gregkh-2.6.orig/drivers/media/video/saa7185.c
++++ gregkh-2.6/drivers/media/video/saa7185.c
+@@ -487,7 +487,6 @@ saa7185_detach_client (struct i2c_client
+ 
+ static struct i2c_driver i2c_driver_saa7185 = {
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "saa7185",	/* name */
+ 	},
+ 
+--- gregkh-2.6.orig/drivers/media/video/saa7191.c
++++ gregkh-2.6/drivers/media/video/saa7191.c
+@@ -789,7 +789,6 @@ static int saa7191_command(struct i2c_cl
+ 
+ static struct i2c_driver i2c_driver_saa7191 = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name 	= "saa7191",
+ 	},
+ 	.id		= I2C_DRIVERID_SAA7191,
+--- gregkh-2.6.orig/drivers/media/video/tda7432.c
++++ gregkh-2.6/drivers/media/video/tda7432.c
+@@ -502,7 +502,6 @@ static int tda7432_command(struct i2c_cl
+ 
+ static struct i2c_driver driver = {
+ 	.driver = {
+-		.owner   = THIS_MODULE,
+ 		.name    = "i2c tda7432 driver",
+ 	},
+ 	.id              = I2C_DRIVERID_TDA7432,
+--- gregkh-2.6.orig/drivers/media/video/tda9840.c
++++ gregkh-2.6/drivers/media/video/tda9840.c
+@@ -222,7 +222,6 @@ static int detach(struct i2c_client *cli
+ 
+ static struct i2c_driver driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "tda9840",
+ 	},
+ 	.id	= I2C_DRIVERID_TDA9840,
+--- gregkh-2.6.orig/drivers/media/video/tda9875.c
++++ gregkh-2.6/drivers/media/video/tda9875.c
+@@ -373,7 +373,6 @@ static int tda9875_command(struct i2c_cl
+ 
+ static struct i2c_driver driver = {
+ 	.driver = {
+-		.owner  = THIS_MODULE,
+ 		.name   = "i2c tda9875 driver",
+ 	},
+ 	.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,
+ 	.driver = {
+-		.owner   = THIS_MODULE,
+         	.name    = "i2c tda9887 driver",
+ 		.suspend = tda9887_suspend,
+ 		.resume  = tda9887_resume,
+--- gregkh-2.6.orig/drivers/media/video/tea6415c.c
++++ gregkh-2.6/drivers/media/video/tea6415c.c
+@@ -191,7 +191,6 @@ static int command(struct i2c_client *cl
+ 
+ static struct i2c_driver driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name 	= "tea6415c",
+ 	},
+ 	.id 	= I2C_DRIVERID_TEA6415C,
+--- gregkh-2.6.orig/drivers/media/video/tea6420.c
++++ gregkh-2.6/drivers/media/video/tea6420.c
+@@ -168,7 +168,6 @@ static int command(struct i2c_client *cl
+ 
+ static struct i2c_driver driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "tea6420",
+ 	},
+ 	.id	= I2C_DRIVERID_TEA6420,
+--- gregkh-2.6.orig/drivers/media/video/tuner-3036.c
++++ gregkh-2.6/drivers/media/video/tuner-3036.c
+@@ -176,7 +176,6 @@ static struct i2c_driver 
+ i2c_driver_tuner = 
+ {
+ 	.driver = {
+-		.owner	=	THIS_MODULE,
+ 		.name	=	"sab3036",
+ 	},
+ 	.id		=	I2C_DRIVERID_SAB3036,
+--- gregkh-2.6.orig/drivers/media/video/tuner-core.c
++++ gregkh-2.6/drivers/media/video/tuner-core.c
+@@ -747,7 +747,6 @@ static struct i2c_driver driver = {
+ 	.detach_client = tuner_detach,
+ 	.command = tuner_command,
+ 	.driver = {
+-		   .owner = THIS_MODULE,
+ 		   .name = "tuner",
+ 		   .suspend = tuner_suspend,
+ 		   .resume = tuner_resume,
+--- gregkh-2.6.orig/drivers/media/video/tvaudio.c
++++ gregkh-2.6/drivers/media/video/tvaudio.c
+@@ -1703,7 +1703,6 @@ static int chip_command(struct i2c_clien
+ 
+ static struct i2c_driver driver = {
+ 	.driver = {
+-		.owner   = THIS_MODULE,
+ 		.name    = "generic i2c audio driver",
+ 	},
+ 	.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
+ 
+ static struct i2c_driver i2c_driver_tveeprom = {
+ 	.driver = {
+-		.owner  = THIS_MODULE,
+ 		.name   = "tveeprom",
+ 	},
+ 	.id             = I2C_DRIVERID_TVEEPROM,
+--- gregkh-2.6.orig/drivers/media/video/tvmixer.c
++++ gregkh-2.6/drivers/media/video/tvmixer.c
+@@ -229,7 +229,6 @@ static int tvmixer_release(struct inode 
+ static struct i2c_driver driver = {
+ #ifdef I2C_PEC
+ 	.driver = {
+-		.owner   = THIS_MODULE,
+ 		.name    = "tv card mixer driver",
+ 	},
+ #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 
+ 
+ static struct i2c_driver driver = {
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "tvp5150",
+ 	},
+ 
+--- gregkh-2.6.orig/drivers/media/video/vpx3220.c
++++ gregkh-2.6/drivers/media/video/vpx3220.c
+@@ -722,7 +722,6 @@ vpx3220_attach_adapter (struct i2c_adapt
+ 
+ static struct i2c_driver vpx3220_i2c_driver = {
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "vpx3220",
+ 	},
+ 
+--- gregkh-2.6.orig/drivers/media/video/wm8775.c
++++ gregkh-2.6/drivers/media/video/wm8775.c
+@@ -233,7 +233,6 @@ static int wm8775_detach(struct i2c_clie
+ /* i2c implementation */
+ static struct i2c_driver i2c_driver = {
+ 	.driver = {
+-		.owner = THIS_MODULE,
+ 		.name = "wm8775",
+ 	},
+