aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm/include/mach
diff options
context:
space:
mode:
authorDavid Brown <davidb@codeaurora.org>2011-01-28 11:31:53 -0800
committerDavid Brown <davidb@codeaurora.org>2011-01-28 11:31:53 -0800
commitecca8194c16bdf6cde99a2b29c23a77901cd61a6 (patch)
tree80b533b480b94b1bdc4dad3b0d300868f44cde04 /arch/arm/mach-msm/include/mach
parentd1f4cec78ee3141a78b2b35969f5bebf7ea9b208 (diff)
parent07a3cc4814f790354d4c7be2c9dc6143a714a07a (diff)
Merge branch 'msm-core' into for-next
* msm-core: msm: Clean up useless ifdefs msm: clock: Add support for more proc_comm clocks msm: clock: Invert debugfs directory layout msm: clock: Move debugfs code from clock.c to clock-debug.c msm: clock: Remove 7x30 and pcom includes from clock.h msm: clock: Remove unused code and definitions msm: Warning fix in trout gpio board file msm: Remove broken register definition from trout
Diffstat (limited to 'arch/arm/mach-msm/include/mach')
-rw-r--r--arch/arm/mach-msm/include/mach/msm_iomap-7x00.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h b/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
index 1e75ed74f16..8f99d97615a 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
@@ -126,10 +126,4 @@
#define MSM_AD5_SIZE (SZ_1M*13)
-#if defined(CONFIG_ARCH_MSM7X30)
-#define MSM_GCC_BASE IOMEM(0xF8009000)
-#define MSM_GCC_PHYS 0xC0182000
-#define MSM_GCC_SIZE SZ_4K
-#endif
-
#endif