diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-12-19 09:36:09 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-12-19 09:36:09 -0800 |
| commit | 52d58c53a7c34e50366724676fb3d4bbc547df79 (patch) | |
| tree | ee9b7d8e7571667276c17c1b5c66eabe8a2355bb /i2c | |
| parent | 88385ef1f489ef0ef12755a7cdbe6575e13b809f (diff) | |
| download | patches-52d58c53a7c34e50366724676fb3d4bbc547df79.tar.gz | |
2.6.15-rc6 refresh
Diffstat (limited to 'i2c')
| -rw-r--r-- | i2c/i2c-mv64xxx-compilation-error-fix.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/i2c/i2c-mv64xxx-compilation-error-fix.patch b/i2c/i2c-mv64xxx-compilation-error-fix.patch deleted file mode 100644 index 436f25779ffb9..0000000000000 --- a/i2c/i2c-mv64xxx-compilation-error-fix.patch +++ /dev/null @@ -1,44 +0,0 @@ -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; - } - |