diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2012-09-10 10:33:08 -0700 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2012-09-13 11:17:41 -0700 |
| commit | cb03af01c612ba97621a927225791a98357959c1 (patch) | |
| tree | e36ece7dd0922e5b5a3d4906f4bc277a194a672f /arch/arm/mach-msm/include/mach/msm_iomap.h | |
| parent | 28a33cbc24e4256c143dce96c7d93bf423229f92 (diff) | |
| download | talos-obmc-linux-cb03af01c612ba97621a927225791a98357959c1.tar.gz talos-obmc-linux-cb03af01c612ba97621a927225791a98357959c1.zip | |
ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist
Remove the unused GCC, ACC, and shared memory definitions in the
8660 static mappings. This allows the 8660 header file to be
included in msm_iomap.h unconditionally.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
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 |
