aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/cns3xxx
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2011-07-06 10:12:50 +0000
committerImre Kaloz <kaloz@openwrt.org>2011-07-06 10:12:50 +0000
commit6961cda93ae707e9c3a943b0eed69eb0c6cfaf9d (patch)
treef2191bbd02c884b646c1dcdaf26143f8940004af /target/linux/cns3xxx
parentc6b66c106d4f5c503b0f082b02bbbb58dac83461 (diff)
downloadupstream-6961cda93ae707e9c3a943b0eed69eb0c6cfaf9d.tar.gz
upstream-6961cda93ae707e9c3a943b0eed69eb0c6cfaf9d.tar.bz2
upstream-6961cda93ae707e9c3a943b0eed69eb0c6cfaf9d.zip
[cns3xxx]: we have an up-to-date mach-type file now
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27486 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/cns3xxx')
-rw-r--r--target/linux/cns3xxx/patches-3.0/100-laguna_support.patch10
1 files changed, 0 insertions, 10 deletions
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