aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/mxc.h
diff options
context:
space:
mode:
authorShawn Guo2013-02-05 10:14:40 +0800
committerShawn Guo2013-02-05 10:14:40 +0800
commitf662f52a91742f2aec738492eab87b937216d89f (patch)
tree4950bc0dd10daf71849a5a3efbe0fb99b6184759 /arch/arm/mach-imx/mxc.h
parent949db153b6466c6f7cad5a427ecea94985927311 (diff)
parent7356420cd34e40fe27bf26555b0bf3f2849a43dd (diff)
Merge tag 'imx-cleanup-3.9' into imx/soc
Diffstat (limited to 'arch/arm/mach-imx/mxc.h')
-rw-r--r--arch/arm/mach-imx/mxc.h13
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/mach-imx/mxc.h b/arch/arm/mach-imx/mxc.h
index d78298366a91..7dce17a9fe6c 100644
--- a/arch/arm/mach-imx/mxc.h
+++ b/arch/arm/mach-imx/mxc.h
@@ -32,7 +32,6 @@
#define MXC_CPU_MX27 27
#define MXC_CPU_MX31 31
#define MXC_CPU_MX35 35
-#define MXC_CPU_MX50 50
#define MXC_CPU_MX51 51
#define MXC_CPU_MX53 53
@@ -126,18 +125,6 @@ extern unsigned int __mxc_cpu_type;
# define cpu_is_mx35() (0)
#endif
-#ifdef CONFIG_SOC_IMX50
-# ifdef mxc_cpu_type
-# undef mxc_cpu_type
-# define mxc_cpu_type __mxc_cpu_type
-# else
-# define mxc_cpu_type MXC_CPU_MX50
-# endif
-# define cpu_is_mx50() (mxc_cpu_type == MXC_CPU_MX50)
-#else
-# define cpu_is_mx50() (0)
-#endif
-
#ifdef CONFIG_SOC_IMX51
# ifdef mxc_cpu_type
# undef mxc_cpu_type