[adm5120] generate firmware images for the ZyXEL P-334WT/P-335WT devices

[openwrt.git] / target / linux / ixp4xx / patches-2.6.23 / 092-nas100d_rtc_fixup.patch

diff --git a/target/linux/ixp4xx/patches-2.6.23/092-nas100d_rtc_fixup.patch b/target/linux/ixp4xx/patches-2.6.23/092-nas100d_rtc_fixup.patch
index a6fda86..00a51bc 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.23/092-nas100d_rtc_fixup.patch
+++ b/target/linux/ixp4xx/patches-2.6.23/092-nas100d_rtc_fixup.patch
@@ -1,15 +1,16 @@
-diff -uprN linux-2.6.23.orig/arch/arm/mach-ixp4xx/nas100d-setup.c linux-2.6.23/arch/arm/mach-ixp4xx/nas100d-setup.c
---- linux-2.6.23.orig/arch/arm/mach-ixp4xx/nas100d-setup.c     2007-10-09 15:31:38.000000000 -0500
-+++ linux-2.6.23/arch/arm/mach-ixp4xx/nas100d-setup.c  2007-10-11 01:06:33.000000000 -0500
-@@ -17,6 +17,7 @@
- #include <linux/serial_8250.h>
+Index: linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-setup.c
+===================================================================
+--- linux-2.6.23.17.orig/arch/arm/mach-ixp4xx/nas100d-setup.c
++++ linux-2.6.23.17/arch/arm/mach-ixp4xx/nas100d-setup.c
+@@ -18,6 +18,7 @@

  #include <linux/leds.h>
  #include <linux/leds.h>

+ #include <linux/i2c-gpio.h>

  
 +#include <asm/setup.h>
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/flash.h>
  
 +#include <asm/setup.h>
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/flash.h>

-@@ -142,6 +143,35 @@ static void nas100d_power_off(void)
+@@ -163,6 +164,35 @@ static void nas100d_power_off(void)

        gpio_line_set(NAS100D_PO_GPIO, IXP4XX_GPIO_HIGH);
  }
  
        gpio_line_set(NAS100D_PO_GPIO, IXP4XX_GPIO_HIGH);
  }
  


@@ -44,8 +45,8 @@ diff -uprN linux-2.6.23.orig/arch/arm/mach-ixp4xx/nas100d-setup.c linux-2.6.23/a
 +
  static void __init nas100d_init(void)
  {
 +
  static void __init nas100d_init(void)
  {

-       ixp4xx_sys_init();
-@@ -170,6 +200,7 @@ MACHINE_START(NAS100D, "Iomega NAS 100d"
+       uint8_t __iomem *f;
+@@ -221,6 +251,7 @@ MACHINE_START(NAS100D, "Iomega NAS 100d"

        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC,
        .boot_params    = 0x00000100,
        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC,
        .boot_params    = 0x00000100,