2.6.15-rc5 refresh

4 files changed, 17 insertions, 17 deletions

diff --git a/i2c/hwmon-vt8231-new-driver.patch b/i2c/hwmon-vt8231-new-driver.patch
index e840d86aa6824..f860388a16ebb 100644
--- a/i2c/hwmon-vt8231-new-driver.patch
+++ b/i2c/hwmon-vt8231-new-driver.patch
@@ -919,8 +919,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +module_exit(sm_vt8231_exit);
 --- gregkh-2.6.orig/MAINTAINERS
 +++ gregkh-2.6/MAINTAINERS
-@@ -2888,6 +2888,12 @@ L:	video4linux-list@redhat.com
- W:	http://linuxtv.org
+@@ -2900,6 +2900,12 @@ W:	http://linuxtv.org
+ T:	quilt http://www.linuxtv.org/download/quilt/
  S:	Maintained
  
 +VT8231 HARDWARE MONITOR DRIVER
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 1c539ac09f7e1..0c1c7d7a4b1d5 100644
--- a/i2c/i2c-client-use-02-make-use-flag-default.patch
+++ b/i2c/i2c-client-use-02-make-use-flag-default.patch
@@ -187,7 +187,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	cs53l32a_info("chip found @ 0x%x (%s)\n", address << 1, adapter->name);
 --- gregkh-2.6.orig/drivers/media/video/cx25840/cx25840-core.c
 +++ gregkh-2.6/drivers/media/video/cx25840/cx25840-core.c
-@@ -737,7 +737,6 @@ static int cx25840_detect_client(struct 
+@@ -767,7 +767,6 @@ static int cx25840_detect_client(struct 
  	client->addr = address;
  	client->adapter = adapter;
  	client->driver = &i2c_driver_cx25840;
@@ -257,7 +257,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	decoder = kmalloc(sizeof(struct saa7114), GFP_KERNEL);
 --- gregkh-2.6.orig/drivers/media/video/saa7115.c
 +++ gregkh-2.6/drivers/media/video/saa7115.c
-@@ -1268,7 +1268,6 @@ static int saa7115_attach(struct i2c_ada
+@@ -1270,7 +1270,6 @@ static int saa7115_attach(struct i2c_ada
  	client->addr = address;
  	client->adapter = adapter;
  	client->driver = &i2c_driver_saa7115;
@@ -337,7 +337,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
 --- gregkh-2.6.orig/drivers/media/video/tveeprom.c
 +++ gregkh-2.6/drivers/media/video/tveeprom.c
-@@ -709,7 +709,6 @@ tveeprom_detect_client(struct i2c_adapte
+@@ -751,7 +751,6 @@ tveeprom_detect_client(struct i2c_adapte
  	client->addr = address;
  	client->adapter = adapter;
  	client->driver = &i2c_driver_tveeprom;
diff --git a/i2c/i2c-drop-driver-flags-02-df-notify.patch b/i2c/i2c-drop-driver-flags-02-df-notify.patch
index d135b6f34941d..69022f5218ca3 100644
--- a/i2c/i2c-drop-driver-flags-02-df-notify.patch
+++ b/i2c/i2c-drop-driver-flags-02-df-notify.patch
@@ -414,7 +414,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  };
 --- 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
+@@ -319,7 +319,6 @@ static void w83792d_init_client(struct i
  static struct i2c_driver w83792d_driver = {
  	.owner = THIS_MODULE,
  	.name = "w83792d",
@@ -684,7 +684,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.command = cs53l32a_command,
 --- gregkh-2.6.orig/drivers/media/video/cx25840/cx25840-core.c
 +++ gregkh-2.6/drivers/media/video/cx25840/cx25840-core.c
-@@ -811,7 +811,6 @@ struct i2c_driver i2c_driver_cx25840 = {
+@@ -841,7 +841,6 @@ static struct i2c_driver i2c_driver_cx25
  	.name = "cx25840",
  
  	.id = I2C_DRIVERID_CX25840,
@@ -707,7 +707,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 @@ -279,7 +279,6 @@ static int ir_probe(struct i2c_adapter *
  static struct i2c_driver driver = {
  	.name           = "ir remote kbd driver",
- 	.id             = I2C_DRIVERID_EXP3, /* FIXME */
+ 	.id             = I2C_DRIVERID_I2C_IR,
 -	.flags          = I2C_DF_NOTIFY,
  	.attach_adapter = ir_probe,
  	.detach_client  = ir_detach,
@@ -794,7 +794,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	.detach_client = saa7114_detach_client,
 --- gregkh-2.6.orig/drivers/media/video/saa7115.c
 +++ gregkh-2.6/drivers/media/video/saa7115.c
-@@ -1354,7 +1354,6 @@ static int saa7115_detach(struct i2c_cli
+@@ -1356,7 +1356,6 @@ static int saa7115_detach(struct i2c_cli
  static struct i2c_driver i2c_driver_saa7115 = {
  	.name = "saa7115",
  	.id = I2C_DRIVERID_SAA711X,
@@ -815,7 +815,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 --- 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
- struct i2c_driver i2c_driver_saa7127 = {
+ static struct i2c_driver i2c_driver_saa7127 = {
  	.name = "saa7127",
  	.id = I2C_DRIVERID_SAA7127,
 -	.flags = I2C_DF_NOTIFY,
@@ -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
-@@ -739,7 +739,6 @@ static struct i2c_driver i2c_driver_tvee
+@@ -781,7 +781,6 @@ static struct i2c_driver i2c_driver_tvee
  	.owner          = THIS_MODULE,
  	.name           = "tveeprom",
  	.id             = I2C_DRIVERID_TVEEPROM,
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 a6d2297884d8a..1682adec92892 100644
--- a/i2c/i2c-drop-driver-owner-and-name-05-media.patch
+++ b/i2c/i2c-drop-driver-owner-and-name-05-media.patch
@@ -191,10 +191,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  
 --- gregkh-2.6.orig/drivers/media/video/cx25840/cx25840-core.c
 +++ gregkh-2.6/drivers/media/video/cx25840/cx25840-core.c
-@@ -807,14 +807,16 @@ static int cx25840_detach_client(struct 
+@@ -837,14 +837,16 @@ static int cx25840_detach_client(struct 
  /* ----------------------------------------------------------------------- */
  
- struct i2c_driver i2c_driver_cx25840 = {
+ static struct i2c_driver i2c_driver_cx25840 = {
 -	.name = "cx25840",
 +	.driver = {
 +		.owner = THIS_MODULE,
@@ -269,7 +269,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +		.owner  = THIS_MODULE,
 +		.name   = "ir remote kbd driver",
 +	},
- 	.id             = I2C_DRIVERID_EXP3, /* FIXME */
+ 	.id             = I2C_DRIVERID_I2C_IR,
  	.attach_adapter = ir_probe,
  	.detach_client  = ir_detach,
 --- gregkh-2.6.orig/drivers/media/video/msp3400.c
@@ -461,7 +461,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	       i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
  
  static unsigned short normal_i2c[] = { 0x42 >> 1, 0x40 >> 1, I2C_CLIENT_END };
-@@ -1351,12 +1352,14 @@ static int saa7115_detach(struct i2c_cli
+@@ -1353,12 +1354,14 @@ static int saa7115_detach(struct i2c_cli
  
  /* i2c implementation */
  static struct i2c_driver i2c_driver_saa7115 = {
@@ -528,7 +528,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 @@ -818,12 +820,14 @@ static int saa7127_detach(struct i2c_cli
  /* ----------------------------------------------------------------------- */
  
- struct i2c_driver i2c_driver_saa7127 = {
+ static struct i2c_driver i2c_driver_saa7127 = {
 -	.name = "saa7127",
 +	.driver = {
 +		.owner = THIS_MODULE,
@@ -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
-@@ -735,8 +735,10 @@ tveeprom_detach_client (struct i2c_clien
+@@ -777,8 +777,10 @@ tveeprom_detach_client (struct i2c_clien
  }
  
  static struct i2c_driver i2c_driver_tveeprom = {