[adm5120] do not overrid CONFIG_BRIDGE (#5163)

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

diff --git a/target/linux/ixp4xx/patches-2.6.26/162-wg302v1_mem_fixup.patch b/target/linux/ixp4xx/patches-2.6.26/162-wg302v1_mem_fixup.patch
index f89698c..684db44 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.26/162-wg302v1_mem_fixup.patch
+++ b/target/linux/ixp4xx/patches-2.6.26/162-wg302v1_mem_fixup.patch
@@ -1,7 +1,7 @@
 --- a/arch/arm/mach-ixp4xx/wg302v1-setup.c
 +++ b/arch/arm/mach-ixp4xx/wg302v1-setup.c
-@@ -100,6 +100,36 @@
-       &wg302_eth[0],
+@@ -115,6 +115,36 @@ static struct platform_device *wg302v1_d
+       &wg302v1_eth[0],
  };
  
 +static char wg302v1_mem_fixup[] __initdata = "mem=32M ";
@@ -37,7 +37,7 @@
  static void __init wg302v1_init(void)
  {
        ixp4xx_sys_init();
-@@ -118,6 +148,7 @@
+@@ -133,6 +163,7 @@ MACHINE_START(WG302V1, "Netgear WG302 v1
        /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */
        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,