aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/plat-mxc/include/mach/mxc.h
diff options
context:
space:
mode:
authorRichard Zhao <richard.zhao@freescale.com>2011-03-03 16:40:03 +0800
committerSascha Hauer <s.hauer@pengutronix.de>2011-03-07 19:29:43 +0100
commitc23eb89ef71cda127cfcfee84292cb2fb5747d4d (patch)
tree0b4a9d7f9a5cec64d6a59b33f3c0913b7a5c6c2e /arch/arm/plat-mxc/include/mach/mxc.h
parent76851671287209759f63c090ffaffca56ba00358 (diff)
ARM: imx3x: clean up ARCH_MX3X
Move to SOC_SOC_IMX3X. Leave ARCH_MX31/35 definitions there, in case some place prevent multi-soc single image. Signed-off-by: Richard Zhao <richard.zhao@freescale.com> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/mxc.h')
-rw-r--r--arch/arm/plat-mxc/include/mach/mxc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h
index 3781f2f2425..7e072637eef 100644
--- a/arch/arm/plat-mxc/include/mach/mxc.h
+++ b/arch/arm/plat-mxc/include/mach/mxc.h
@@ -103,7 +103,7 @@ extern unsigned int __mxc_cpu_type;
# define cpu_is_mx27() (0)
#endif
-#ifdef CONFIG_ARCH_MX31
+#ifdef CONFIG_SOC_IMX31
# ifdef mxc_cpu_type
# undef mxc_cpu_type
# define mxc_cpu_type __mxc_cpu_type
@@ -115,7 +115,7 @@ extern unsigned int __mxc_cpu_type;
# define cpu_is_mx31() (0)
#endif
-#ifdef CONFIG_ARCH_MX35
+#ifdef CONFIG_SOC_IMX35
# ifdef mxc_cpu_type
# undef mxc_cpu_type
# define mxc_cpu_type __mxc_cpu_type