[kernel] update to 2.6.26.5 and 2.6.25.17

[openwrt.git] / target / linux / ixp4xx / patches-2.6.25 / 162-wg302v1_mem_fixup.patch

diff --git a/target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch b/target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch
index db8923d36c085536291e3fad74899d1895cc8b49..f89698cca4d7670cc30a5b287d3c5a60157f29a6 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch
+++ b/target/linux/ixp4xx/patches-2.6.25/162-wg302v1_mem_fixup.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c
-===================================================================
---- linux-2.6.25.1.orig/arch/arm/mach-ixp4xx/wg302v1-setup.c
-+++ linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c
-@@ -100,6 +100,36 @@ static struct platform_device *wg302v1_d
+--- a/arch/arm/mach-ixp4xx/wg302v1-setup.c
++++ b/arch/arm/mach-ixp4xx/wg302v1-setup.c
+@@ -100,6 +100,36 @@
        &wg302_eth[0],
  };
  
@@ -39,7 +37,7 @@ Index: linux-2.6.25.1/arch/arm/mach-ixp4xx/wg302v1-setup.c
  static void __init wg302v1_init(void)
  {
        ixp4xx_sys_init();
-@@ -118,6 +148,7 @@ MACHINE_START(WG302V1, "Netgear WG302 v1
+@@ -118,6 +148,7 @@
        /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,