diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2007-05-23 19:48:34 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2007-05-23 19:48:34 +0000 |
commit | b19f76df97917a2d21534fe083b3b71c6a7cfc60 (patch) | |
tree | ff6ea55e0827dbb86f63faf337088dcffaa0521c /target/linux/ixp4xx-2.6/patches/700-remove_avila_ixdp425_setup.patch | |
parent | a19c8358e12b0c67a6dda0cbb4123f108c5c8544 (diff) | |
download | master-187ad058-b19f76df97917a2d21534fe083b3b71c6a7cfc60.tar.gz master-187ad058-b19f76df97917a2d21534fe083b3b71c6a7cfc60.tar.bz2 master-187ad058-b19f76df97917a2d21534fe083b3b71c6a7cfc60.zip |
break trunk temporary - upgrade to 2.6.21.1 and iptables 1.3.7
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7315 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx-2.6/patches/700-remove_avila_ixdp425_setup.patch')
-rw-r--r-- | target/linux/ixp4xx-2.6/patches/700-remove_avila_ixdp425_setup.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/target/linux/ixp4xx-2.6/patches/700-remove_avila_ixdp425_setup.patch b/target/linux/ixp4xx-2.6/patches/700-remove_avila_ixdp425_setup.patch deleted file mode 100644 index 852f6558b9..0000000000 --- a/target/linux/ixp4xx-2.6/patches/700-remove_avila_ixdp425_setup.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-pci.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-pci.c 2007-04-15 14:26:04.000000000 +0200 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/ixdp425-pci.c 2007-05-10 11:10:40.000000000 +0200 -@@ -66,7 +66,7 @@ - int __init ixdp425_pci_init(void) - { - if (machine_is_ixdp425() || machine_is_ixcdp1100() || -- machine_is_avila() || machine_is_ixdp465() || machine_is_compex()) -+ machine_is_ixdp465() || machine_is_compex()) - pci_common_init(&ixdp425_pci); - return 0; - } -diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-setup.c linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/ixdp425-setup.c ---- linux-2.6.19.2/arch/arm/mach-ixp4xx/ixdp425-setup.c 2007-04-15 14:26:49.000000000 +0200 -+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/ixdp425-setup.c 2007-05-10 11:10:01.000000000 +0200 -@@ -205,23 +205,3 @@ - .init_machine = ixdp425_init, - MACHINE_END - #endif -- --/* -- * Avila is functionally equivalent to IXDP425 except that it adds -- * a CF IDE slot hanging off the expansion bus. When we have a -- * driver for IXP4xx CF IDE with driver model support we'll move -- * Avila to it's own setup file. -- */ --#ifdef CONFIG_ARCH_AVILA --MACHINE_START(AVILA, "Gateworks Avila Network Platform") -- /* Maintainer: Deepak Saxena <dsaxena@plexity.net> */ -- .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, -- .boot_params = 0x0100, -- .init_machine = ixdp425_init, --MACHINE_END --#endif -- |