From: Imre Kaloz <kaloz@openwrt.org>
Date: Wed, 6 Jul 2011 10:12:50 +0000 (+0000)
Subject: we have an up-to-date mach-type file now
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c93b5653bc9866cb7700e50e2a2f914bfcfbf677;p=openwrt%2Fstaging%2Fthess.git

we have an up-to-date mach-type file now

SVN-Revision: 27486
---

diff --git a/target/linux/cns3xxx/patches-3.0/100-laguna_support.patch b/target/linux/cns3xxx/patches-3.0/100-laguna_support.patch
index 12d80a9213..c5431272d6 100644
--- a/target/linux/cns3xxx/patches-3.0/100-laguna_support.patch
+++ b/target/linux/cns3xxx/patches-3.0/100-laguna_support.patch
@@ -934,16 +934,6 @@
  obj-$(CONFIG_SMP)			+= platsmp.o headsmp.o
  obj-$(CONFIG_HOTPLUG_CPU)		+= hotplug.o
  obj-$(CONFIG_LOCAL_TIMERS)		+= localtimer.o
---- a/arch/arm/tools/mach-types
-+++ b/arch/arm/tools/mach-types
-@@ -444,6 +444,7 @@ icontrol		MACH_ICONTROL		ICONTROL		2624
- qsd8x50a_st1_5		MACH_QSD8X50A_ST1_5	QSD8X50A_ST1_5		2627
- mx23evk			MACH_MX23EVK		MX23EVK			2629
- ap4evb			MACH_AP4EVB		AP4EVB			2630
-+gw2388			MACH_GW2388		GW2388			2635
- mityomapl138		MACH_MITYOMAPL138	MITYOMAPL138		2650
- guruplug		MACH_GURUPLUG		GURUPLUG		2659
- spear310		MACH_SPEAR310		SPEAR310		2660
 --- a/arch/arm/mach-cns3xxx/pcie.c
 +++ b/arch/arm/mach-cns3xxx/pcie.c
 @@ -365,7 +365,7 @@ static int cns3xxx_pcie_abort_handler(un