diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:34:39 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:34:39 -0700 |
| commit | a8e1ceb728d249fbe0bc5e30b9b8ceb0f33b54f5 (patch) | |
| tree | 653ab2d3049d1231e7e462155564a6953d0a720a /arch/arm/mach-msm/include/mach/msm_iomap.h | |
| parent | 8b1a13b02812b60b88920801363920956691feb3 (diff) | |
| parent | e6ca4ae895e9fbf8b96d3ee1dd44ea96e95babad (diff) | |
| download | lwn-a8e1ceb728d249fbe0bc5e30b9b8ceb0f33b54f5.tar.gz lwn-a8e1ceb728d249fbe0bc5e30b9b8ceb0f33b54f5.zip | |
Merge branch 'next/boards' into HEAD
Conflicts:
arch/arm/mach-shmobile/board-armadillo800eva.c
Diffstat (limited to 'arch/arm/mach-msm/include/mach/msm_iomap.h')
| -rw-r--r-- | arch/arm/mach-msm/include/mach/msm_iomap.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h index 00afdfb8c38f..2ab7cf0919b3 100644 --- a/arch/arm/mach-msm/include/mach/msm_iomap.h +++ b/arch/arm/mach-msm/include/mach/msm_iomap.h @@ -41,12 +41,11 @@ #include "msm_iomap-7x30.h" #elif defined(CONFIG_ARCH_QSD8X50) #include "msm_iomap-8x50.h" -#elif defined(CONFIG_ARCH_MSM8X60) -#include "msm_iomap-8x60.h" #else #include "msm_iomap-7x00.h" #endif +#include "msm_iomap-8x60.h" #include "msm_iomap-8960.h" #define MSM_DEBUG_UART_SIZE SZ_4K |