new patches and 2.6.16-rc3 refresh

2 files changed, 51 insertions, 1 deletions

diff --git a/i2c/i2c-convert-semaphores-to-mutexes-2.patch b/i2c/i2c-convert-semaphores-to-mutexes-2.patch
index e886211da7dae..c987677dc04ec 100644
--- a/i2c/i2c-convert-semaphores-to-mutexes-2.patch
+++ b/i2c/i2c-convert-semaphores-to-mutexes-2.patch
@@ -94,7 +94,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	if (!(s4882_adapter = kzalloc(5 * sizeof(struct i2c_adapter),
 --- gregkh-2.6.orig/drivers/i2c/busses/i2c-isa.c
 +++ gregkh-2.6/drivers/i2c/busses/i2c-isa.c
-@@ -137,7 +137,7 @@ int i2c_isa_del_driver(struct i2c_driver
+@@ -125,7 +125,7 @@ int i2c_isa_del_driver(struct i2c_driver
  
  static int __init i2c_isa_init(void)
  {
diff --git a/i2c/i2c-drop-outdated-probe-remove-code-in-i2c-isa.patch b/i2c/i2c-drop-outdated-probe-remove-code-in-i2c-isa.patch
new file mode 100644
index 0000000000000..599705e639bdd
--- /dev/null
+++ b/i2c/i2c-drop-outdated-probe-remove-code-in-i2c-isa.patch
@@ -0,0 +1,50 @@
+From khali@linux-fr.org  Mon Feb 13 20:21:05 2006
+Date: Wed, 8 Feb 2006 20:38:29 +0100
+From: Jean Delvare <khali@linux-fr.org>
+To: Greg KH <greg@kroah.com>
+Cc: Nicolas Mailhot <nicolas.mailhot@laposte.net>
+Subject: i2c: Drop outdated probe/remove code in i2c-isa
+Message-Id: <20060208203829.694cd90b.khali@linux-fr.org>
+
+Probe and remove methods are now defined at bus level. No more need to
+redefine them at driver level in i2c-isa.
+
+This lets us get rid of these annoying messages:
+Driver 'it87-isa' needs updating - please use bus_type methods
+
+Thanks to Nicolas Mailhot for reporting the problem and testing the fix.
+
+Signed-off-by: Jean Delvare <khali@linux-fr.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ drivers/i2c/busses/i2c-isa.c |   12 ------------
+ 1 file changed, 12 deletions(-)
+
+--- gregkh-2.6.orig/drivers/i2c/busses/i2c-isa.c
++++ gregkh-2.6/drivers/i2c/busses/i2c-isa.c
+@@ -72,16 +72,6 @@ static ssize_t show_adapter_name(struct 
+ }
+ static DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL);
+ 
+-static int i2c_isa_device_probe(struct device *dev)
+-{
+-	return -ENODEV;
+-}
+-
+-static int i2c_isa_device_remove(struct device *dev)
+-{
+-	return 0;
+-}
+-
+ 
+ /* We implement an interface which resembles i2c_{add,del}_driver,
+    but for i2c-isa drivers. We don't have to remember and handle lists
+@@ -93,8 +83,6 @@ int i2c_isa_add_driver(struct i2c_driver
+ 
+ 	/* Add the driver to the list of i2c drivers in the driver core */
+ 	driver->driver.bus = &i2c_bus_type;
+-	driver->driver.probe = i2c_isa_device_probe;
+-	driver->driver.remove = i2c_isa_device_remove;
+ 	res = driver_register(&driver->driver);
+ 	if (res)
+ 		return res;