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 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
board-sx1.c
diff --git
a/arch/arm/mach-omap1/board-sx1.c
b/arch/arm/mach-omap1/board-sx1.c
index
172a28f
..
2bea941
100644
(file)
--- a/
arch/arm/mach-omap1/board-sx1.c
+++ b/
arch/arm/mach-omap1/board-sx1.c
@@
-420,7
+420,7
@@
static void __init omap_sx1_map_io(void)
}
MACHINE_START(SX1, "OMAP310 based Siemens SX1")
- .
boot_params = 0x10000
100,
+ .
atag_offset = 0x
100,
.map_io = omap_sx1_map_io,
.reserve = omap_reserve,
.init_irq = omap_sx1_init_irq,