aboutsummaryrefslogtreecommitdiffstats
path: root/i2c
diff options
context:
space:
mode:
authorGreg KH <greg@press.(none)>2005-10-25 11:11:43 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2005-10-25 11:11:43 -0700
commit2d19c24f5f5ac81213cac52bd0b631b1ce493f89 (patch)
tree269ad7581f1cb1f75f2dc34a6cfa7f26925521d3 /i2c
parentccba89f3af1dedceea62ff14af61a1e4bb039824 (diff)
downloadpatches-2d19c24f5f5ac81213cac52bd0b631b1ce493f89.tar.gz
update rest of the series based on rmk's patches
Diffstat (limited to 'i2c')
-rw-r--r--i2c/i2c-owner-field-02-struct-device-driver.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/i2c/i2c-owner-field-02-struct-device-driver.patch b/i2c/i2c-owner-field-02-struct-device-driver.patch
index 050c7e264229f..f421a8390e284 100644
--- a/i2c/i2c-owner-field-02-struct-device-driver.patch
+++ b/i2c/i2c-owner-field-02-struct-device-driver.patch
@@ -80,7 +80,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
.probe = mv64xxx_i2c_probe,
--- gregkh-2.6.orig/drivers/i2c/busses/i2c-s3c2410.c
+++ gregkh-2.6/drivers/i2c/busses/i2c-s3c2410.c
-@@ -898,6 +898,7 @@ static int s3c24xx_i2c_resume(struct dev
+@@ -896,6 +896,7 @@ static int s3c24xx_i2c_resume(struct dev
/* device driver for platform bus bits */
static struct device_driver s3c2410_i2c_driver = {
@@ -88,7 +88,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
.name = "s3c2410-i2c",
.bus = &platform_bus_type,
.probe = s3c24xx_i2c_probe,
-@@ -906,6 +907,7 @@ static struct device_driver s3c2410_i2c_
+@@ -904,6 +905,7 @@ static struct device_driver s3c2410_i2c_
};
static struct device_driver s3c2440_i2c_driver = {