summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2011-11-08 10:33:03 -0800
committerDavid Brown <davidb@codeaurora.org>2011-11-10 10:17:06 -0800
commit650e3f0d66ade2a614d854765dae3bbc9a87f58d (patch)
treed849c9687ae7c9a3afcc9e49444eba167ec16394 /arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
parent1ea6b8f48918282bdca0b32a34095504ee65bab5 (diff)
downloadlinux-stable-650e3f0d66ade2a614d854765dae3bbc9a87f58d.tar.gz
linux-stable-650e3f0d66ade2a614d854765dae3bbc9a87f58d.tar.bz2
linux-stable-650e3f0d66ade2a614d854765dae3bbc9a87f58d.zip
ARM: msm: Consolidate and move DEBUG_LL to DEBUG_LL choice
Now that DEBUG_LL is a choice we can move MSM's homegrown choice menu to DEBUG_LL. 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-7x30.h')
-rw-r--r--arch/arm/mach-msm/include/mach/msm_iomap-7x30.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h b/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
index 37694442d1bd..198202c267c8 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
@@ -89,18 +89,6 @@
#define MSM_UART3_PHYS 0xACC00000
#define MSM_UART3_SIZE SZ_4K
-#ifdef CONFIG_MSM_DEBUG_UART
-#define MSM_DEBUG_UART_BASE 0xE1000000
-#if CONFIG_MSM_DEBUG_UART == 1
-#define MSM_DEBUG_UART_PHYS MSM_UART1_PHYS
-#elif CONFIG_MSM_DEBUG_UART == 2
-#define MSM_DEBUG_UART_PHYS MSM_UART2_PHYS
-#elif CONFIG_MSM_DEBUG_UART == 3
-#define MSM_DEBUG_UART_PHYS MSM_UART3_PHYS
-#endif
-#define MSM_DEBUG_UART_SIZE SZ_4K
-#endif
-
#define MSM_MDC_BASE IOMEM(0xE0200000)
#define MSM_MDC_PHYS 0xAA500000
#define MSM_MDC_SIZE SZ_1M