[kernel] update to 2.6.25.1 and refresh patches

[openwrt/svn-archive/archive.git] / target / linux / ixp4xx / patches-2.6.25 / 012-rtc_x1205_new_style.patch

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 d81a570eaae0e0b0dfc0c1c69f9dae2ee265c487..cea2e63591199af98e104746422ab0de6dd9bdc8 100644 (file)
--- 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");