ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist
authorStephen Boyd <sboyd@codeaurora.org>
Mon, 10 Sep 2012 17:33:08 +0000 (10:33 -0700)
committerDavid Brown <davidb@codeaurora.org>
Thu, 13 Sep 2012 18:17:41 +0000 (11:17 -0700)
commitcb03af01c612ba97621a927225791a98357959c1
treee36ece7dd0922e5b5a3d4906f4bc277a194a672f
parent28a33cbc24e4256c143dce96c7d93bf423229f92
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>
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
arch/arm/mach-msm/include/mach/msm_iomap.h
arch/arm/mach-msm/io.c