refresh generic 2.6.24 patches to match upstream style

[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.24 / 940-arm_mach_types.patch

diff --git a/target/linux/generic-2.6/patches-2.6.24/940-arm_mach_types.patch b/target/linux/generic-2.6/patches-2.6.24/940-arm_mach_types.patch
index 8f0378f6bf4fbf84b74f04e9457c005ff855e754..7d3a952bbc4d78396ac7fa868eb9026c793a69d8 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/940-arm_mach_types.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/940-arm_mach_types.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.24.7/arch/arm/tools/mach-types
-===================================================================
---- linux-2.6.24.7.orig/arch/arm/tools/mach-types
-+++ linux-2.6.24.7/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.24.7/arch/arm/tools/mach-types
  #
  # machine_is_xxx      CONFIG_xxxx             MACH_TYPE_xxx           number
  #
-@@ -266,7 +266,7 @@ stork_egg          ARCH_STORK_EGG          STORK_EGG               24
+@@ -266,7 +266,7 @@
  wismo                 SA1100_WISMO            WISMO                   249
  ezlinx                        ARCH_EZLINX             EZLINX                  250
  at91rm9200            ARCH_AT91RM9200         AT91RM9200              251
@@ -20,7 +18,7 @@ Index: linux-2.6.24.7/arch/arm/tools/mach-types
  neptune                       ARCH_NEPTUNE            NEPTUNE                 253
  hackkit                       SA1100_HACKKIT          HACKKIT                 254
  pxa_wins30            ARCH_PXA_WINS30         PXA_WINS30              255
-@@ -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
@@ -36,7 +34,7 @@ Index: linux-2.6.24.7/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
-@@ -661,7 +661,6 @@ a9200ec                    MACH_A9200EC            A9200EC                 645
+@@ -661,7 +661,6 @@
  pnx0105                       MACH_PNX0105            PNX0105                 646
  adcpoecpu             MACH_ADCPOECPU          ADCPOECPU               647
  csb637                        MACH_CSB637             CSB637                  648
@@ -44,7 +42,7 @@ Index: linux-2.6.24.7/arch/arm/tools/mach-types
  mb9200                        MACH_MB9200             MB9200                  650
  kulun                 MACH_KULUN              KULUN                   651
  snapper                       MACH_SNAPPER            SNAPPER                 652
-@@ -953,7 +952,6 @@ fred_jack          MACH_FRED_JACK          FRED_JACK               93
+@@ -953,7 +952,6 @@
  ttg_color1            MACH_TTG_COLOR1         TTG_COLOR1              940
  nxeb500hmi            MACH_NXEB500HMI         NXEB500HMI              941
  netdcu8                       MACH_NETDCU8            NETDCU8                 942
@@ -52,7 +50,7 @@ Index: linux-2.6.24.7/arch/arm/tools/mach-types
  ng_fvx538             MACH_NG_FVX538          NG_FVX538               944
  ng_fvs338             MACH_NG_FVS338          NG_FVS338               945
  pnx4103                       MACH_PNX4103            PNX4103                 946
-@@ -1148,7 +1146,7 @@ aidx270                  MACH_AIDX270            AIDX270                 1134
+@@ -1148,7 +1146,7 @@
  rema                  MACH_REMA               REMA                    1135
  bps1000                       MACH_BPS1000            BPS1000                 1136
  hw90350                       MACH_HW90350            HW90350                 1137
@@ -61,7 +59,7 @@ Index: linux-2.6.24.7/arch/arm/tools/mach-types
  bluetouch             MACH_BLUETOUCH          BLUETOUCH               1139
  vstms                 MACH_VSTMS              VSTMS                   1140
  xsbase270             MACH_XSBASE270          XSBASE270               1141
-@@ -1214,7 +1212,7 @@ osstbox                  MACH_OSSTBOX            OSSTBOX                 1203
+@@ -1214,7 +1212,7 @@
  kbat9261              MACH_KBAT9261           KBAT9261                1204
  ct1100                        MACH_CT1100             CT1100                  1205
  akcppxa                       MACH_AKCPPXA            AKCPPXA                 1206
@@ -70,7 +68,7 @@ Index: linux-2.6.24.7/arch/arm/tools/mach-types
  hitrack                       MACH_HITRACK            HITRACK                 1208
  syme1                 MACH_SYME1              SYME1                   1209
  syhl1                 MACH_SYHL1              SYHL1                   1210
-@@ -1299,7 +1297,7 @@ xp179                    MACH_XP179              XP179                   1290
+@@ -1299,7 +1297,7 @@
  h4300                 MACH_H4300              H4300                   1291
  goramo_mlr            MACH_GORAMO_MLR         GORAMO_MLR              1292
  mxc30020evb           MACH_MXC30020EVB        MXC30020EVB             1293
@@ -79,7 +77,7 @@ Index: linux-2.6.24.7/arch/arm/tools/mach-types
  adsportalplus         MACH_ADSPORTALPLUS      ADSPORTALPLUS           1295
  mmsp2plus             MACH_MMSP2PLUS          MMSP2PLUS               1296
  em_x270                       MACH_EM_X270            EM_X270                 1297
-@@ -1367,3 +1365,346 @@ db88f5281              MACH_DB88F5281          DB88F5281               13
+@@ -1367,3 +1365,346 @@
  csb726                        MACH_CSB726             CSB726                  1359
  tik27                 MACH_TIK27              TIK27                   1360
  mx_uc7420             MACH_MX_UC7420          MX_UC7420               1361