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 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-generic.c
diff --git
a/arch/arm/mach-omap2/board-generic.c
b/arch/arm/mach-omap2/board-generic.c
index
7e6e6ca
..
16cc068
100644
(file)
--- a/
arch/arm/mach-omap2/board-generic.c
+++ b/
arch/arm/mach-omap2/board-generic.c
@@
-50,7
+50,7
@@
static void __init omap_generic_init(void)
static void __init omap_generic_map_io(void)
{
omap2_set_globals_242x(); /* should be 242x, 243x, or 343x */
- omap2_map_common_io();
+ omap2
42x
_map_common_io();
}
MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx")