Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[pandora-kernel.git] / arch / arm / mach-mxs / include / mach / mxs.h

diff --git a/arch/arm/mach-mxs/include/mach/mxs.h b/arch/arm/mach-mxs/include/mach/mxs.h
index f186c08..35a89dd 100644 (file)
--- a/arch/arm/mach-mxs/include/mach/mxs.h
+++ b/arch/arm/mach-mxs/include/mach/mxs.h
@@ -28,8 +28,13 @@
 /*
  * MXS CPU types
  */
-#define cpu_is_mx23()          (machine_is_mx23evk())
-#define cpu_is_mx28()          (machine_is_mx28evk())
+#define cpu_is_mx23()          (                                       \
+               machine_is_mx23evk() ||                                 \
+               0)
+#define cpu_is_mx28()          (                                       \
+               machine_is_mx28evk() ||                                 \
+               machine_is_tx28() ||                                    \
+               0)
 
 /*
  * IO addresses common to MXS-based