Merge branch 'devel-gpio' into omap-for-linus

1 files changed, 1 insertions, 2 deletions

diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
index b01d6e422d7a..4e91f453ea90 100644
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -280,8 +280,6 @@ static void __init omap_apollon_init_irq(void)
         omap_board_config_size = ARRAY_SIZE(apollon_config);
         omap2_init_common_hw(NULL, NULL);
         omap_init_irq();
-        omap_gpio_init();
-        apollon_init_smc91x();
 }
 
 static void __init apollon_led_init(void)
@@ -322,6 +320,7 @@ static void __init omap_apollon_init(void)
 
         omap2420_mux_init(board_mux, OMAP_PACKAGE_ZAC);
 
+        apollon_init_smc91x();
         apollon_led_init();
         apollon_flash_init();
         apollon_usb_init();