git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/lola' into for-linus
[pandora-kernel.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
ef3ebf2
..
7a9a03e
100644
(file)
--- a/
arch/arm/mach-msm/board-mahimahi.c
+++ b/
arch/arm/mach-msm/board-mahimahi.c
@@
-74,8
+74,6
@@
static void __init mahimahi_map_io(void)
extern struct sys_timer msm_timer;
MACHINE_START(MAHIMAHI, "mahimahi")
-#ifdef CONFIG_MSM_DEBUG_UART
-#endif
.boot_params = 0x20000100,
.fixup = mahimahi_fixup,
.map_io = mahimahi_map_io,