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 / 190-cambria_support.patch

diff --git a/target/linux/ixp4xx/patches-2.6.37/190-cambria_support.patch b/target/linux/ixp4xx/patches-2.6.37/190-cambria_support.patch
index 683d8be68aa9fb48ae652bc6439f8545f994e9fa..32199d8c31e23462b71d0ad861ec757c0de51a5f 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.37/190-cambria_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.37/190-cambria_support.patch
@@ -77,7 +77,7 @@
 +subsys_initcall(cambria_pci_init);
 --- /dev/null
 +++ b/arch/arm/mach-ixp4xx/cambria-setup.c
-@@ -0,0 +1,429 @@
+@@ -0,0 +1,427 @@
 +/*
 + * arch/arm/mach-ixp4xx/cambria-setup.c
 + *
@@ -499,8 +499,6 @@
 +
 +MACHINE_START(CAMBRIA, "Gateworks Cambria series")
 +      /* 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,