Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...

[karo-tx-linux.git] / arch / arm / mach-msm / board-halibut.c

diff --git a/arch/arm/mach-msm/board-halibut.c b/arch/arm/mach-msm/board-halibut.c
index 75dabb16c802380d6a02e06a1807afe72282cfc9..18a3c97bc8632b6d781c940be2fedb6bd8e1eba3 100644 (file)
--- a/arch/arm/mach-msm/board-halibut.c
+++ b/arch/arm/mach-msm/board-halibut.c
@@ -93,8 +93,6 @@ static void __init halibut_map_io(void)
 }
 
 MACHINE_START(HALIBUT, "Halibut Board (QCT SURF7200A)")
-#ifdef CONFIG_MSM_DEBUG_UART
-#endif
        .boot_params    = 0x10000100,
        .fixup          = halibut_fixup,
        .map_io         = halibut_map_io,