ixp4xx: clean up patches, fold the 2.6.37 update patch into the relevant board suppor...

[openwrt/svn-archive/archive.git] / target / linux / ixp4xx / patches-2.6.37 / 120-compex_support.patch

diff --git a/target/linux/ixp4xx/patches-2.6.37/120-compex_support.patch b/target/linux/ixp4xx/patches-2.6.37/120-compex_support.patch
index c5493149578a2920dc5b41e312eaad180babe4db..b11ffd975c6d5a2c0e199300dcee6ffcaeeec8fd 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.37/120-compex_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.37/120-compex_support.patch
@@ -50,7 +50,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  obj-$(CONFIG_IXP4XX_QMGR)     += ixp4xx_qmgr.o
 --- /dev/null
 +++ b/arch/arm/mach-ixp4xx/compex-setup.c
-@@ -0,0 +1,136 @@
+@@ -0,0 +1,134 @@
 +/*
 + * arch/arm/mach-ixp4xx/compex-setup.c
 + *
@@ -179,8 +179,6 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
 +
 +MACHINE_START(COMPEX, "Compex WP18 / NP18A")
 +      /* Maintainer: Imre Kaloz <Kaloz@openwrt.org> */
-+      .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-+      .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
 +      .map_io         = ixp4xx_map_io,
 +      .init_irq       = ixp4xx_init_irq,
 +      .timer          = &ixp4xx_timer,