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

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

diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c
index e2e9562f4de96ea4a766d73dcb0592a0bc44adaf..cfd618d3bda81cfacf82310d76a9aa5bc55e209f 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3logic.c
+++ b/arch/arm/mach-omap2/board-omap3logic.c
@@ -199,7 +199,6 @@ static void __init omap3logic_init_irq(void)
 {
        omap2_init_common_hw(NULL, NULL);
        omap_init_irq();
-       omap_gpio_init();
 }
 
 #ifdef CONFIG_OMAP_MUX