more stuff

2 files changed, 86 insertions, 0 deletions

diff --git a/i2c/i2c-driver-owner-cleanup-03.patch b/i2c/i2c-driver-owner-cleanup-03.patch
new file mode 100644
index 0000000000000..86ae51ff96394
--- /dev/null
+++ b/i2c/i2c-driver-owner-cleanup-03.patch
@@ -0,0 +1,42 @@
+From khali@linux-fr.org Wed Dec  7 12:57:29 2005
+Date: Wed, 7 Dec 2005 21:54:26 +0100
+From: Jean Delvare <khali@linux-fr.org>
+To: Greg KH <greg@kroah.com>
+Subject: i2c: Documentation update
+Message-Id: <20051207215426.247fa402.khali@linux-fr.org>
+Content-Disposition: inline; filename=i2c-driver-owner-cleanup-03.patch
+
+Update the i2c documentation to reflect the recent change to
+i2c_add_driver.
+
+Signed-off-by: Jean Delvare <khali@linux-fr.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ Documentation/i2c/porting-clients |    5 ++---
+ Documentation/i2c/writing-clients |    1 -
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+--- gregkh-2.6.orig/Documentation/i2c/porting-clients
++++ gregkh-2.6/Documentation/i2c/porting-clients
+@@ -126,9 +126,8 @@ Technical changes:
+ * [Driver] The flags field of the i2c_driver structure is gone.
+   I2C_DF_NOTIFY is now the default behavior.
+   The i2c_driver structure has a driver member, which is itself a
+-  structure, those owner and name members should be initialized to
+-  THIS_MODULE and a driver name string, respectively. i2c_driver
+-  itself has no name member anymore.
++  structure, those name member should be initialized to a driver name
++  string. i2c_driver itself has no name member anymore.
+ 
+ Coding policy:
+ 
+--- gregkh-2.6.orig/Documentation/i2c/writing-clients
++++ gregkh-2.6/Documentation/i2c/writing-clients
+@@ -26,7 +26,6 @@ address.
+ 
+ static struct i2c_driver foo_driver = {
+ 	.driver = {
+-		.owner	= THIS_MODULE,
+ 		.name	= "foo",
+ 	},
+ 	.attach_adapter	= &foo_attach_adapter,
diff --git a/i2c/i2c-mv64xxx-compilation-error-fix.patch b/i2c/i2c-mv64xxx-compilation-error-fix.patch
new file mode 100644
index 0000000000000..436f25779ffb9
--- /dev/null
+++ b/i2c/i2c-mv64xxx-compilation-error-fix.patch
@@ -0,0 +1,44 @@
+From khali@linux-fr.org Wed Dec  7 10:50:26 2005
+Date: Wed, 7 Dec 2005 19:52:13 +0100
+From: Jean Delvare <khali@linux-fr.org>
+To: Greg KH <greg@kroah.com>
+Cc: "Mark A. Greer" <mgreer@mvista.com>
+Subject: i2c: Fix i2c-mv64xxx compilation error
+Message-Id: <20051207195213.15e80fda.khali@linux-fr.org>
+Content-Disposition: inline; filename=i2c-mv64xxx-compilation-error-fix.patch
+
+From: "Mark A. Greer" <mgreer@mvista.com>
+
+The busses/i2c-mv64xxx.c driver doesn't currently compile because of an
+incorrect argument to dev_err().  This patch fixes that.
+
+Signed-off-by: Mark A. Greer <mgreer@mvista.com>
+Signed-off-by: Jean Delvare <khali@linux-fr.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ drivers/i2c/busses/i2c-mv64xxx.c |   11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+--- gregkh-2.6.orig/drivers/i2c/busses/i2c-mv64xxx.c
++++ gregkh-2.6/drivers/i2c/busses/i2c-mv64xxx.c
+@@ -529,14 +529,15 @@ mv64xxx_i2c_probe(struct platform_device
+ 	i2c_set_adapdata(&drv_data->adapter, drv_data);
+ 
+ 	if (request_irq(drv_data->irq, mv64xxx_i2c_intr, 0,
+-		MV64XXX_I2C_CTLR_NAME, drv_data)) {
+-
+-		dev_err(dev, "mv64xxx: Can't register intr handler "
+-			"irq: %d\n", drv_data->irq);
++			MV64XXX_I2C_CTLR_NAME, drv_data)) {
++		dev_err(&drv_data->adapter.dev,
++			"mv64xxx: Can't register intr handler irq: %d\n",
++			drv_data->irq);
+ 		rc = -EINVAL;
+ 		goto exit_unmap_regs;
+ 	} else if ((rc = i2c_add_adapter(&drv_data->adapter)) != 0) {
+-		dev_err(dev, "mv64xxx: Can't add i2c adapter, rc: %d\n", -rc);
++		dev_err(&drv_data->adapter.dev,
++			"mv64xxx: Can't add i2c adapter, rc: %d\n", -rc);
+ 		goto exit_free_irq;
+ 	}
+