[kernel] update to 2.6.25.1 and refresh patches

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

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 a691496521ec2ee801b26ec48a00cb4a34819e18..898b2fd849f095dc99d158739e74e62e7a783449 100644 (file)
--- 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,5 +1,7 @@
---- linux-2.6.24.2/arch/arm/tools/mach-types   2008-04-09 01:34:47.000000000 +0200
-+++ linux-2.6.24.2-owrt/arch/arm/tools/mach-types      2008-04-09 14:26:57.000000000 +0200
+Index: linux-2.6.25.1/arch/arm/tools/mach-types
+===================================================================
+--- linux-2.6.25.1.orig/arch/arm/tools/mach-types
++++ linux-2.6.25.1/arch/arm/tools/mach-types
 @@ -12,7 +12,7 @@
  #
  #   http://www.arm.linux.org.uk/developer/machines/?action=new
@@ -9,7 +11,7 @@
  #
  # machine_is_xxx      CONFIG_xxxx             MACH_TYPE_xxx           number
  #
-@@ -381,13 +381,13 @@
+@@ -381,13 +381,13 @@ ks8695p                  ARCH_KS8695P            KS8695P                 363
  se4000                        ARCH_SE4000             SE4000                  364
  quadriceps            ARCH_QUADRICEPS         QUADRICEPS              365
  bronco                        ARCH_BRONCO             BRONCO                  366
@@ -25,7 +27,7 @@
  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 @@
+@@ -1463,7 +1463,7 @@ artemis                  MACH_ARTEMIS            ARTEMIS                 1462
  htctitan              MACH_HTCTITAN           HTCTITAN                1463
  qranium                       MACH_QRANIUM            QRANIUM                 1464
  adx_wsc2              MACH_ADX_WSC2           ADX_WSC2                1465
@@ -34,7 +36,7 @@
  bboard                        MACH_BBOARD             BBOARD                  1467
  cambria                       MACH_CAMBRIA            CAMBRIA                 1468
  mt7xxx                        MACH_MT7XXX             MT7XXX                  1469
-@@ -1611,3 +1611,112 @@
+@@ -1611,3 +1611,112 @@ kb9263                 MACH_KB9263             KB9263                  1612
  mt7108                        MACH_MT7108             MT7108                  1613
  smtr2440              MACH_SMTR2440           SMTR2440                1614
  manao                 MACH_MANAO              MANAO                   1615