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

[cascardo/linux.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 abd864a..0dff9de 100644 (file)
--- a/arch/arm/mach-omap2/board-zoom.c
+++ b/arch/arm/mach-omap2/board-zoom.c
@@ -62,8 +62,6 @@ static struct omap_board_mux board_mux[] __initdata = {
        OMAP3_MUX(ETK_D6, OMAP_MUX_MODE2 | OMAP_PIN_INPUT_PULLUP),
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux      NULL
 #endif
 
 static struct mtd_partition zoom_nand_partitions[] = {