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

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

diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c
index df6900e8ad5a09d7897cb69efb1144c44bef5f14..86867138f1e43c823177ee17ac415abd73bad6ff 100644 (file)
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@ -441,8 +441,6 @@ static struct omap_board_mux board_mux[] __initdata = {
        OMAP3_MUX(SAD2D_MCAD23, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLDOWN),
        { .reg_offset = OMAP_MUX_TERMINATOR },
 };
-#else
-#define board_mux      NULL
 #endif