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/devel-stable' into next/board
[pandora-kernel.git]
/
arch
/
arm
/
mach-ux500
/
board-u5500.c
diff --git
a/arch/arm/mach-ux500/board-u5500.c
b/arch/arm/mach-ux500/board-u5500.c
index
2d9e191
..
e014aa7
100644
(file)
--- a/
arch/arm/mach-ux500/board-u5500.c
+++ b/
arch/arm/mach-ux500/board-u5500.c
@@
-118,7
+118,7
@@
static void __init u5500_init_machine(void)
}
MACHINE_START(U5500, "ST-Ericsson U5500 Platform")
- .
boot_params = 0x00000
100,
+ .
atag_offset = 0x
100,
.map_io = u5500_map_io,
.init_irq = ux500_init_irq,
.timer = &ux500_timer,