summaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/patches-2.6.37/190-cambria_support.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-02-26 06:23:32 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-02-26 06:23:32 +0000
commitc3f3c60730962183f4e6c1d51385f4cab31ae667 (patch)
tree66262a90ad050a1a2be5892f28f8944323b10696 /target/linux/ixp4xx/patches-2.6.37/190-cambria_support.patch
parent053485e66e75c4347783c3458be35aa287b4bdf4 (diff)
downloadmaster-31e0f0ae-c3f3c60730962183f4e6c1d51385f4cab31ae667.tar.gz
master-31e0f0ae-c3f3c60730962183f4e6c1d51385f4cab31ae667.tar.bz2
master-31e0f0ae-c3f3c60730962183f4e6c1d51385f4cab31ae667.zip
ixp4xx: clean up patches, fold the 2.6.37 update patch into the relevant board support patches
SVN-Revision: 25727
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.37/190-cambria_support.patch')
-rw-r--r--target/linux/ixp4xx/patches-2.6.37/190-cambria_support.patch4
1 files changed, 1 insertions, 3 deletions
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 683d8be68a..32199d8c31 100644
--- 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,