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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-zoom.c
diff --git
a/arch/arm/mach-omap2/board-zoom.c
b/arch/arm/mach-omap2/board-zoom.c
index
d56c796
..
be6684d
100644
(file)
--- a/
arch/arm/mach-omap2/board-zoom.c
+++ b/
arch/arm/mach-omap2/board-zoom.c
@@
-130,7
+130,7
@@
static void __init omap_zoom_init(void)
}
MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")
}
MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")
- .
boot_params = 0x80000
100,
+ .
atag_offset = 0x
100,
.reserve = omap_reserve,
.map_io = omap3_map_io,
.init_early = omap3430_init_early,
.reserve = omap_reserve,
.map_io = omap3_map_io,
.init_early = omap3430_init_early,
@@
-140,7
+140,7
@@
MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")
MACHINE_END
MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board")
MACHINE_END
MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board")
- .
boot_params = 0x80000
100,
+ .
atag_offset = 0x
100,
.reserve = omap_reserve,
.map_io = omap3_map_io,
.init_early = omap3630_init_early,
.reserve = omap_reserve,
.map_io = omap3_map_io,
.init_early = omap3630_init_early,