cleanup

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6843 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ixp4xx-2.6/config/default b/target/linux/ixp4xx-2.6/config/default
index 3e3cb55..15c3bfb 100644 (file)
--- 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_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
 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 f4773cf..eddd80d 100644 (file)
--- 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
 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
  
          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
 +config MACH_PRONGHORNMETRO
 +      bool "Pronghorn Metro"
 +      select PCI