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 'prcm_scm_misc_fixes_3.2' of git://git.pwsan.com/linux-2.6 into fixes
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
board-h3.c
diff --git
a/arch/arm/mach-omap1/board-h3.c
b/arch/arm/mach-omap1/board-h3.c
index
8f5b6af
..
74ebe72
100644
(file)
--- a/
arch/arm/mach-omap1/board-h3.c
+++ b/
arch/arm/mach-omap1/board-h3.c
@@
-435,23
+435,13
@@
static void __init h3_init(void)
h3_mmc_init();
}
h3_mmc_init();
}
-static void __init h3_init_irq(void)
-{
- omap1_init_common_hw();
- omap1_init_irq();
-}
-
-static void __init h3_map_io(void)
-{
- omap1_map_common_io();
-}
-
MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board")
/* Maintainer: Texas Instruments, Inc. */
.atag_offset = 0x100,
MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board")
/* Maintainer: Texas Instruments, Inc. */
.atag_offset = 0x100,
- .map_io = h3_map_io,
+ .map_io = omap16xx_map_io,
+ .init_early = omap1_init_early,
.reserve = omap_reserve,
.reserve = omap_reserve,
- .init_irq =
h3
_init_irq,
+ .init_irq =
omap1
_init_irq,
.init_machine = h3_init,
.timer = &omap1_timer,
MACHINE_END
.init_machine = h3_init,
.timer = &omap1_timer,
MACHINE_END