aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2007-04-02 19:31:25 +0000
committerImre Kaloz <kaloz@openwrt.org>2007-04-02 19:31:25 +0000
commit0f245643a36d9be72a328ab1239cbe302fb826dc (patch)
treef98b97effde88400b741961febf4804fb5a0cd43 /target
parent298d50f55f6c4dce42418f59411961edc142a016 (diff)
downloadupstream-0f245643a36d9be72a328ab1239cbe302fb826dc.tar.gz
upstream-0f245643a36d9be72a328ab1239cbe302fb826dc.tar.bz2
upstream-0f245643a36d9be72a328ab1239cbe302fb826dc.zip
cleanup
SVN-Revision: 6843
Diffstat (limited to 'target')
-rw-r--r--target/linux/ixp4xx-2.6/config/default1
-rw-r--r--target/linux/ixp4xx-2.6/patches/400-pronghorn_metro.patch10
2 files changed, 1 insertions, 10 deletions
diff --git a/target/linux/ixp4xx-2.6/config/default b/target/linux/ixp4xx-2.6/config/default
index 3e3cb554e1..15c3bfb53e 100644
--- a/target/linux/ixp4xx-2.6/config/default
+++ b/target/linux/ixp4xx-2.6/config/default
@@ -219,7 +219,6 @@ CONFIG_MACH_GATEWAY7001=y
# CONFIG_MACH_IXDPG425 is not set
CONFIG_MACH_NAS100D=y
CONFIG_MACH_NSLU2=y
-CONFIG_MACH_PRONGHORN=y
CONFIG_MACH_PRONGHORNMETRO=y
CONFIG_MACH_WG302V2=y
# CONFIG_MAC_PARTITION is not set
diff --git a/target/linux/ixp4xx-2.6/patches/400-pronghorn_metro.patch b/target/linux/ixp4xx-2.6/patches/400-pronghorn_metro.patch
index f4773cf31f..eddd80d662 100644
--- a/target/linux/ixp4xx-2.6/patches/400-pronghorn_metro.patch
+++ b/target/linux/ixp4xx-2.6/patches/400-pronghorn_metro.patch
@@ -1,18 +1,10 @@
diff -Nur linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig
--- linux-2.6.19.2/arch/arm/mach-ixp4xx/Kconfig 2007-04-02 16:10:51.000000000 +0200
+++ linux-2.6.19.2-owrt/arch/arm/mach-ixp4xx/Kconfig 2007-04-02 16:11:12.000000000 +0200
-@@ -49,6 +49,22 @@
+@@ -49,6 +49,14 @@
WG302 v2 or WAG302 v2 Access Points. For more information
on this platform, see http://openwrt.org
-+config MACH_PRONGHORN
-+ bool "Pronghorn"
-+ select PCI
-+ help
-+ Say 'Y' here if you want your kernel to support the ADI
-+ Engineering Pronghorn Platform. For more
-+ information on this platform, see <file:Documentation/arm/IXP4xx>.
-+
+config MACH_PRONGHORNMETRO
+ bool "Pronghorn Metro"
+ select PCI