Merge with /home/tmlind/src/kernel/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap1 / board-netstar.c

diff --git a/arch/arm/mach-omap1/board-netstar.c b/arch/arm/mach-omap1/board-netstar.c
index 60d5f8a3339c0f370ae4269428bcaad952b9727c..58f783930d45486536d5c08c6b7212175693e2a3 100644 (file)
--- a/arch/arm/mach-omap1/board-netstar.c
+++ b/arch/arm/mach-omap1/board-netstar.c
@@ -65,7 +65,6 @@ static struct omap_board_config_kernel netstar_config[] = {
 
 static void __init netstar_init_irq(void)
 {
-       omap1_init_common_hw();
        omap_init_irq();
        omap_gpio_init();
 }
@@ -109,7 +108,7 @@ static void __init netstar_init(void)
 
 static void __init netstar_map_io(void)
 {
-       omap1_map_common_io();
+       omap_map_common_io();
 }
 
 #define MACHINE_PANICED                1