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

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

diff --git a/arch/arm/mach-omap2/board-zoom.c b/arch/arm/mach-omap2/board-zoom.c
index 27979fd527d39695e97ce35b6eb5e5bcb9d08acc..0dff9deaa8961cb1ff4714531bcfbe527b1c10e6 100644 (file)
--- a/arch/arm/mach-omap2/board-zoom.c
+++ b/arch/arm/mach-omap2/board-zoom.c
@@ -43,7 +43,6 @@ static void __init omap_zoom_init_irq(void)
                                h8mbx00u0mer0em_sdrc_params);
 
        omap_init_irq();
-       omap_gpio_init();
 }
 
 #ifdef CONFIG_OMAP_MUX