git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
board-zoom3.c
diff --git
a/arch/arm/mach-omap2/board-zoom3.c
b/arch/arm/mach-omap2/board-zoom3.c
index 33147042485f5f505c7a0906f2b0d94e02a9f460..5b605eba3e7bcf449c9fa62020233e49b8f8ae8a 100644
(file)
--- a/
arch/arm/mach-omap2/board-zoom3.c
+++ b/
arch/arm/mach-omap2/board-zoom3.c
@@
-77,6
+77,7
@@
MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board")
.io_pg_offst = (ZOOM_UART_VIRT >> 18) & 0xfffc,
.boot_params = 0x80000100,
.map_io = omap_zoom_map_io,
+ .reserve = omap_reserve,
.init_irq = omap_zoom_init_irq,
.init_machine = omap_zoom_init,
.timer = &omap_timer,