diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-24 10:38:23 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-24 10:38:23 +0200 |
| commit | ba361ee78f915aa9e26acbbdf6f57712c69506d2 (patch) | |
| tree | 60fb18386ba11f4b8653133abbf630e98aa2f8f6 /arch/arm/mach-imx/include/mach/generic.h | |
| parent | b108afa01ac0ceb72db750fefd32a67c0247c9ca (diff) | |
| parent | fd9c7d412ee7ff7b351be35afa01ccfc48404080 (diff) | |
| download | barebox-ba361ee78f915aa9e26acbbdf6f57712c69506d2.tar.gz barebox-ba361ee78f915aa9e26acbbdf6f57712c69506d2.tar.xz | |
Merge branch 'pu/mx6-v2' into next
Conflicts:
arch/arm/Makefile
arch/arm/mach-imx/Kconfig
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/include/mach/generic.h')
| -rw-r--r-- | arch/arm/mach-imx/include/mach/generic.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/include/mach/generic.h b/arch/arm/mach-imx/include/mach/generic.h index 930d52c642..99f301205c 100644 --- a/arch/arm/mach-imx/include/mach/generic.h +++ b/arch/arm/mach-imx/include/mach/generic.h @@ -54,5 +54,11 @@ u64 imx_uid(void); #define cpu_is_mx53() (0) #endif +#ifdef CONFIG_ARCH_IMX6 +#define cpu_is_mx6() (1) +#else +#define cpu_is_mx6() (0) +#endif + #define cpu_is_mx23() (0) #define cpu_is_mx28() (0) |