aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2011-11-26 11:39:14 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-21 12:57:34 -0800
commit5f29f2e19e7c6231559992be25acb2bfb0fa37d9 (patch)
treeef5042cf78b84a3b38d299e9457f4511353f2928
parentff40cdaf4ca551c43c94da75ab99719781de123a (diff)
arm: mx23: recognise stmp378x as mx23
commit 11357be9246c7d1acf9b37ad54a18b29bbb734be upstream. Adding the machine_is_* line was forgotten when converting mach-stmp378x to mach-mxs. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--arch/arm/mach-mxs/include/mach/mxs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/include/mach/mxs.h b/arch/arm/mach-mxs/include/mach/mxs.h
index 35a89dd2724..1332f73c9ad 100644
--- a/arch/arm/mach-mxs/include/mach/mxs.h
+++ b/arch/arm/mach-mxs/include/mach/mxs.h
@@ -30,6 +30,7 @@
*/
#define cpu_is_mx23() ( \
machine_is_mx23evk() || \
+ machine_is_stmp378x() || \
0)
#define cpu_is_mx28() ( \
machine_is_mx28evk() || \