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

[mv-sheeva.git] / arch / arm / mach-omap2 / board-omap3pandora.c

diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index 445b15843212d3824466bbd07496fe96ed86624a..de8df58b8f1d9d36d9e330e5094f6ad1e7b24f70 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -639,7 +639,6 @@ static void __init omap3pandora_init_irq(void)
        omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
                             mt46h32m32lf6_sdrc_params);
        omap_init_irq();
-       omap_gpio_init();
 }
 
 static void pandora_wl1251_set_power(bool enable)