Merge branch 'master' into tk71

[mv-sheeva.git] / arch / arm / mach-msm / board-mahimahi.c

diff --git a/arch/arm/mach-msm/board-mahimahi.c b/arch/arm/mach-msm/board-mahimahi.c
index bcbefdfe7b5e582052fb14334085567c7ef91de5..ef3ebf2f763be9c660554f4c6189aa67028a2ea0 100644 (file)
--- a/arch/arm/mach-msm/board-mahimahi.c
+++ b/arch/arm/mach-msm/board-mahimahi.c
@@ -75,8 +75,6 @@ extern struct sys_timer msm_timer;
 
 MACHINE_START(MAHIMAHI, "mahimahi")
 #ifdef CONFIG_MSM_DEBUG_UART
-       .phys_io        = MSM_DEBUG_UART_PHYS,
-       .io_pg_offst    = ((MSM_DEBUG_UART_BASE) >> 18) & 0xfffc,
 #endif
        .boot_params    = 0x20000100,
        .fixup          = mahimahi_fixup,