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

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

diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index 3dab44e3eb4255638026670d4cf4a4a6066ccb6a..7455b0aadf86a3ab5612a59a12603f96039eb986 100644 (file)
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -294,7 +294,6 @@ static void __init omap_ldp_init_irq(void)
        omap_board_config_size = ARRAY_SIZE(ldp_config);
        omap2_init_common_hw(NULL, NULL);
        omap_init_irq();
-       omap_gpio_init();
 }
 
 static struct twl4030_usb_data ldp_usb_data = {
@@ -380,8 +379,6 @@ static struct platform_device *ldp_devices[] __initdata = {
 static struct omap_board_mux board_mux[] __initdata = {
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux      NULL
 #endif
 
 static struct omap_musb_board_data musb_board_data = {