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/io.c | |
| parent | 28a33cbc24e4256c143dce96c7d93bf423229f92 (diff) | |
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/io.c')
| -rw-r--r-- | arch/arm/mach-msm/io.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c index a1e7b116885..b0016a00ddf 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 |