Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6

[~andy/linux] / arch / arm / mach-omap1 / board-htcherald.c

diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c
index fcd1a3c31896b0a2bb28a5cf5a187eaccd356e29..3e91baab1a89de784651bea3dfd2da8b7cb63459 100644 (file)
--- a/arch/arm/mach-omap1/board-htcherald.c
+++ b/arch/arm/mach-omap1/board-htcherald.c
@@ -499,7 +499,7 @@ static void __init htcherald_lcd_init(void)
 
 static void __init htcherald_map_io(void)
 {
-       omap1_map_common_io();
+       omap7xx_map_io();
 
        /*
         * The LCD panel must be disabled and DMA turned off here, as doing
@@ -600,20 +600,14 @@ static void __init htcherald_init(void)
 #endif
 }
 
-static void __init htcherald_init_irq(void)
-{
-       printk(KERN_INFO "htcherald_init_irq.\n");
-       omap1_init_common_hw();
-       omap1_init_irq();
-}
-
 MACHINE_START(HERALD, "HTC Herald")
        /* Maintainer: Cory Maccarrone <darkstar6262@gmail.com> */
        /* Maintainer: wing-linux.sourceforge.net */
        .atag_offset    = 0x100,
        .map_io         = htcherald_map_io,
+       .init_early     = omap1_init_early,
        .reserve        = omap_reserve,
-       .init_irq       = htcherald_init_irq,
+       .init_irq       = omap1_init_irq,
        .init_machine   = htcherald_init,
        .timer          = &omap1_timer,
 MACHINE_END