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 'x86-bootmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
board-zoom2.c
diff --git
a/arch/arm/mach-omap2/board-zoom2.c
b/arch/arm/mach-omap2/board-zoom2.c
index bb87cf7878ff6e0931e2b1042c82ae4299d93cbf..9a26f84b11417f355586f4f45b19d1be5aae52d0 100644
(file)
--- a/
arch/arm/mach-omap2/board-zoom2.c
+++ b/
arch/arm/mach-omap2/board-zoom2.c
@@
-87,7
+87,7
@@
static void __init omap_zoom2_init(void)
static void __init omap_zoom2_map_io(void)
{
omap2_set_globals_343x();
- omap
2
_map_common_io();
+ omap
34xx
_map_common_io();
}
MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")