Merge branch 'next/boards' into HEAD

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / arm / mach-msm / include / mach / msm_iomap-8x60.h

diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
index b51ba8a..199372e 100644 (file)
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
@@ -52,12 +52,8 @@
 #define MSM8X60_TMR0_SIZE      SZ_4K
 
 #ifdef CONFIG_DEBUG_MSM8660_UART
-#define MSM_DEBUG_UART_BASE    0xE1040000
+#define MSM_DEBUG_UART_BASE    0xF0040000
 #define MSM_DEBUG_UART_PHYS    0x19C40000
 #endif
 
-#ifndef __ASSEMBLY__
-extern void msm_map_msm8x60_io(void);
-#endif
-
 #endif