Merge branch 'msm-core' into for-next
[pandora-kernel.git] / arch / arm / mach-msm / board-qsd8x50.c
index 29ef683..b464d48 100644 (file)
@@ -195,8 +195,6 @@ static void __init qsd8x50_init(void)
 }
 
 MACHINE_START(QSD8X50_SURF, "QCT QSD8X50 SURF")
-#ifdef CONFIG_MSM_DEBUG_UART
-#endif
        .boot_params = PHYS_OFFSET + 0x100,
        .map_io = qsd8x50_map_io,
        .init_irq = qsd8x50_init_irq,
@@ -205,8 +203,6 @@ MACHINE_START(QSD8X50_SURF, "QCT QSD8X50 SURF")
 MACHINE_END
 
 MACHINE_START(QSD8X50A_ST1_5, "QCT QSD8X50A ST1.5")
-#ifdef CONFIG_MSM_DEBUG_UART
-#endif
        .boot_params = PHYS_OFFSET + 0x100,
        .map_io = qsd8x50_map_io,
        .init_irq = qsd8x50_init_irq,