diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-02-26 06:23:32 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-02-26 06:23:32 +0000 |
| commit | b098bd68748ef059c6a1f65b19b65c3aeef2b2b0 (patch) | |
| tree | f18d4db2e3dfa5e42dd0e91462d665efad563633 /target/linux/ixp4xx/patches-2.6.37/110-pronghorn_series_support.patch | |
| parent | 0ca65fd7bf04d9e654dbf3a6f448f2141d47f76b (diff) | |
| download | master-187ad058-b098bd68748ef059c6a1f65b19b65c3aeef2b2b0.tar.gz master-187ad058-b098bd68748ef059c6a1f65b19b65c3aeef2b2b0.tar.bz2 master-187ad058-b098bd68748ef059c6a1f65b19b65c3aeef2b2b0.zip | |
ixp4xx: clean up patches, fold the 2.6.37 update patch into the relevant board support patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25727 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.37/110-pronghorn_series_support.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.37/110-pronghorn_series_support.patch | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.37/110-pronghorn_series_support.patch b/target/linux/ixp4xx/patches-2.6.37/110-pronghorn_series_support.patch index f3e088b4a0..805dedc111 100644 --- a/target/linux/ixp4xx/patches-2.6.37/110-pronghorn_series_support.patch +++ b/target/linux/ixp4xx/patches-2.6.37/110-pronghorn_series_support.patch @@ -19,7 +19,7 @@ + bool "ADI Pronghorn series" + select PCI + help -+ Say 'Y' here if you want your kernel to support the ADI ++ Say 'Y' here if you want your kernel to support the ADI + Engineering Pronghorn series. For more + information on this platform, see http://www.adiengineering.com + @@ -127,7 +127,7 @@ +subsys_initcall(pronghorn_pci_init); --- /dev/null +++ b/arch/arm/mach-ixp4xx/pronghorn-setup.c -@@ -0,0 +1,245 @@ +@@ -0,0 +1,241 @@ +/* + * arch/arm/mach-ixp4xx/pronghorn-setup.c + * @@ -354,8 +354,6 @@ + +MACHINE_START(PRONGHORN, "ADI Engineering Pronghorn") + /* 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, @@ -365,8 +363,6 @@ + +MACHINE_START(PRONGHORNMETRO, "ADI Engineering Pronghorn Metro") + /* 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, |