diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-02 10:17:03 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-05-02 10:17:03 +0000 |
| commit | 60289aade7304b10112a6839dcf293e719f057eb (patch) | |
| tree | b992b5d551457de6a5d6f53b37b9eec182c68c29 /target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch | |
| parent | 9fcaee9fccd3fc3605de7c3578013211b8486827 (diff) | |
[kernel] update to 2.6.25.1 and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11006 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch b/target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch index d81a570ea..cea2e6359 100644 --- a/target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch +++ b/target/linux/ixp4xx/patches-2.6.25/012-rtc_x1205_new_style.patch @@ -2,10 +2,10 @@ drivers/rtc/rtc-x1205.c | 128 ++++++++++++++++-------------------------------- 1 file changed, 43 insertions(+), 85 deletions(-) -Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c +Index: linux-2.6.25.1/drivers/rtc/rtc-x1205.c =================================================================== ---- linux-2.6.25-rc6-armeb.orig/drivers/rtc/rtc-x1205.c 2008-03-20 10:24:13.000000000 +1030 -+++ linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c 2008-03-20 10:24:23.000000000 +1030 +--- linux-2.6.25.1.orig/drivers/rtc/rtc-x1205.c ++++ linux-2.6.25.1/drivers/rtc/rtc-x1205.c @@ -22,20 +22,7 @@ #include <linux/rtc.h> #include <linux/delay.h> @@ -28,7 +28,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c /* offsets into CCR area */ -@@ -91,19 +78,7 @@ +@@ -91,19 +78,7 @@ I2C_CLIENT_INSMOD; #define X1205_HR_MIL 0x80 /* Set in ccr.hour for 24 hr mode */ @@ -49,7 +49,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c /* * In the routines that deal directly with the x1205 hardware, we use -@@ -497,58 +472,51 @@ +@@ -497,58 +472,51 @@ static ssize_t x1205_sysfs_show_dtrim(st } static DEVICE_ATTR(dtrim, S_IRUGO, x1205_sysfs_show_dtrim, NULL); @@ -135,7 +135,7 @@ Index: linux-2.6.25-rc6-armeb/drivers/rtc/rtc-x1205.c i2c_set_clientdata(client, rtc); -@@ -565,45 +533,35 @@ +@@ -565,45 +533,35 @@ static int x1205_probe(struct i2c_adapte else dev_err(&client->dev, "couldn't read status\n"); |