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 'depends/rmk/memory_h' into next/cleanup2
[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
68f930f
..
dc0bcb5
100644
(file)
--- a/
arch/arm/mach-msm/board-sapphire.c
+++ b/
arch/arm/mach-msm/board-sapphire.c
@@
-105,7
+105,7
@@
static void __init sapphire_map_io(void)
MACHINE_START(SAPPHIRE, "sapphire")
/* Maintainer: Brian Swetland <swetland@google.com> */
- .
boot_params = PLAT_PHYS_OFFSET +
0x100,
+ .
atag_offset =
0x100,
.fixup = sapphire_fixup,
.map_io = sapphire_map_io,
.init_irq = sapphire_init_irq,