Merge remote branch 'rmk/for-linus' into for-linus

[~andy/linux] / arch / arm / mach-msm / board-sapphire.c

diff --git a/arch/arm/mach-msm/board-sapphire.c b/arch/arm/mach-msm/board-sapphire.c
index 83604f526f0f350720acaf9f43de47cd8d070018..68f930f07d77c2bb86192e329036db861ccedafc 100644 (file)
--- a/arch/arm/mach-msm/board-sapphire.c
+++ b/arch/arm/mach-msm/board-sapphire.c
@@ -105,8 +105,6 @@ static void __init sapphire_map_io(void)
 
 MACHINE_START(SAPPHIRE, "sapphire")
 /* Maintainer: Brian Swetland <swetland@google.com> */
-#ifdef CONFIG_MSM_DEBUG_UART
-#endif
        .boot_params    = PLAT_PHYS_OFFSET + 0x100,
        .fixup          = sapphire_fixup,
        .map_io         = sapphire_map_io,