Merge tag 'msm-board-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/boards

Final parts to allow msm8660 and msm8960 to build into the same
kernel.  This won't work without the changes from msm-dt-for-3.7.

* tag 'msm-board-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
  ARM: msm: Allow 8960 and 8660 to compile together
  ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist

1 files changed, 0 insertions, 2 deletions

diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index a1e7b1168850..b0016a00ddf2 100644
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -109,8 +109,6 @@ static struct map_desc msm8x60_io_desc[] __initdata = {
         MSM_CHIP_DEVICE(QGIC_CPU, MSM8X60),
         MSM_CHIP_DEVICE(TMR, MSM8X60),
         MSM_CHIP_DEVICE(TMR0, MSM8X60),
-        MSM_DEVICE(ACC),
-        MSM_DEVICE(GCC),
 #ifdef CONFIG_DEBUG_MSM8660_UART
         MSM_DEVICE(DEBUG_UART),
 #endif