diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 15:18:11 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 15:18:11 +0200 |
| commit | 3b3c281073288ebdc6161108bdc4c9f1b08bdee3 (patch) | |
| tree | 397f9d7b4654da2759d5f88af34b9b3bb7467e80 /arch/arm/mach-mxs/include | |
| parent | 8eb41582d2106eccc7717047d1184481f5a1b3a6 (diff) | |
| parent | ea42a0d058428845047206ff895e60520a7ff256 (diff) | |
Merge branch 'imx/board' into next/board
Diffstat (limited to 'arch/arm/mach-mxs/include')
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/mxs.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/uncompress.h | 1 |
2 files changed, 2 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..05823187ec0 100644 --- a/arch/arm/mach-mxs/include/mach/mxs.h +++ b/arch/arm/mach-mxs/include/mach/mxs.h @@ -33,6 +33,7 @@ 0) #define cpu_is_mx28() ( \ machine_is_mx28evk() || \ + machine_is_m28evk() || \ machine_is_tx28() || \ 0) diff --git a/arch/arm/mach-mxs/include/mach/uncompress.h b/arch/arm/mach-mxs/include/mach/uncompress.h index 7f8bf653964..67776746f14 100644 --- a/arch/arm/mach-mxs/include/mach/uncompress.h +++ b/arch/arm/mach-mxs/include/mach/uncompress.h @@ -63,6 +63,7 @@ static inline void __arch_decomp_setup(unsigned long arch_id) mxs_duart_base = MX23_DUART_BASE_ADDR; break; case MACH_TYPE_MX28EVK: + case MACH_TYPE_M28EVK: case MACH_TYPE_TX28: mxs_duart_base = MX28_DUART_BASE_ADDR; break; |