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 git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/linux-staging into stagi...
[pandora-kernel.git]
/
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
83604f5
..
68f930f
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,