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 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block
[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
b937123
..
eaecbf4
100644
(file)
--- a/
arch/arm/mach-omap2/board-generic.c
+++ b/
arch/arm/mach-omap2/board-generic.c
@@
-33,6
+33,7
@@
static void __init omap_generic_init_irq(void)
{
+ omap2_init_common_hw();
omap_init_irq();
}
@@
-64,7
+65,7
@@
static void __init omap_generic_init(void)
static void __init omap_generic_map_io(void)
{
- omap_map_common_io();
+ omap
2
_map_common_io();
}
MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx")