aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.25/940-arm_mach_types.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-05-30 16:30:51 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-05-30 16:30:51 +0000
commit0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2 (patch)
tree5e3bc42552316a5cdaf8eee331305ff7b55c7bad /target/linux/generic-2.6/patches-2.6.25/940-arm_mach_types.patch
parent2004a63a81f73ab8d3b926815a11119b5b81c071 (diff)
downloadmaster-187ad058-0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2.tar.gz
master-187ad058-0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2.tar.bz2
master-187ad058-0d62d39c21daa3d3ee6f974ccf3e3ab3008d79c2.zip
refresh generic 2.6.25 patches to match upstream style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11296 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/940-arm_mach_types.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/940-arm_mach_types.patch12
1 files changed, 5 insertions, 7 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/940-arm_mach_types.patch b/target/linux/generic-2.6/patches-2.6.25/940-arm_mach_types.patch
index 7414920cd3..c6c28a0037 100644
--- a/target/linux/generic-2.6/patches-2.6.25/940-arm_mach_types.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/940-arm_mach_types.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.4/arch/arm/tools/mach-types
-===================================================================
---- linux-2.6.25.4.orig/arch/arm/tools/mach-types
-+++ linux-2.6.25.4/arch/arm/tools/mach-types
+--- a/arch/arm/tools/mach-types
++++ b/arch/arm/tools/mach-types
@@ -12,7 +12,7 @@
#
# http://www.arm.linux.org.uk/developer/machines/?action=new
@@ -11,7 +9,7 @@ Index: linux-2.6.25.4/arch/arm/tools/mach-types
#
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
#
-@@ -381,13 +381,13 @@ ks8695p ARCH_KS8695P KS8695P 363
+@@ -381,13 +381,13 @@
se4000 ARCH_SE4000 SE4000 364
quadriceps ARCH_QUADRICEPS QUADRICEPS 365
bronco ARCH_BRONCO BRONCO 366
@@ -27,7 +25,7 @@ Index: linux-2.6.25.4/arch/arm/tools/mach-types
rcube ARCH_RCUBE RCUBE 374
rea_olv ARCH_REA_OLV REA_OLV 375
pxa_iphone ARCH_PXA_IPHONE PXA_IPHONE 376
-@@ -1463,7 +1463,7 @@ artemis MACH_ARTEMIS ARTEMIS 1462
+@@ -1463,7 +1463,7 @@
htctitan MACH_HTCTITAN HTCTITAN 1463
qranium MACH_QRANIUM QRANIUM 1464
adx_wsc2 MACH_ADX_WSC2 ADX_WSC2 1465
@@ -36,7 +34,7 @@ Index: linux-2.6.25.4/arch/arm/tools/mach-types
bboard MACH_BBOARD BBOARD 1467
cambria MACH_CAMBRIA CAMBRIA 1468
mt7xxx MACH_MT7XXX MT7XXX 1469
-@@ -1611,3 +1611,112 @@ kb9263 MACH_KB9263 KB9263 1612
+@@ -1611,3 +1611,112 @@
mt7108 MACH_MT7108 MT7108 1613
smtr2440 MACH_SMTR2440 SMTR2440 1614
manao MACH_MANAO MANAO 1615