Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into...

[firefly-linux-kernel-4.4.55.git] / arch / arm / tools / mach-types

diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 55590a4d87c932984404d1df13ca4c296c9d7117..28ccae2cb6d4178e457f7c67d2b5291f235ef950 100644 (file)
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -1608,7 +1608,6 @@ kb9263                    MACH_KB9263             KB9263                  1612
 mt7108                 MACH_MT7108             MT7108                  1613
 smtr2440               MACH_SMTR2440           SMTR2440                1614
 manao                  MACH_MANAO              MANAO                   1615
-cm_x300                        MACH_CM_X300            CM_X300                 1616
 gulfstream_kp          MACH_GULFSTREAM_KP      GULFSTREAM_KP           1617
 lanreadyfn522          MACH_LANREADYFN522      LANREADYFN522           1618
 arma37                 MACH_ARMA37             ARMA37                  1619
@@ -2912,7 +2911,8 @@ smdkv310          MACH_SMDKV310           SMDKV310                2925
 siemens_l0             MACH_SIEMENS_L0         SIEMENS_L0              2926
 ventana                        MACH_VENTANA            VENTANA                 2927
 wm8505_7in_netbook     MACH_WM8505_7IN_NETBOOK WM8505_7IN_NETBOOK      2928
-ec4350sdb              MACH_EC4350SDB          EC4350SDB               2929
+rk29                   MACH_RK29               RK29                    2929
+#ec4350sdb             MACH_EC4350SDB          EC4350SDB               2929
 mimas                  MACH_MIMAS              MIMAS                   2930
 titan                  MACH_TITAN              TITAN                   2931
 craneboard             MACH_CRANEBOARD         CRANEBOARD              2932