From 7203f8a48bb63015ebe58a6f2a38aec1cb208b9d Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Thu, 2 Dec 2010 13:25:40 +0000 Subject: arm: mach-omap2: remove NULL board_mux from board files If CONFIG_OMAP_MUX is not enabled, we can define board_mux in the header file instead of forcing every single board to define it. Signed-off-by: Aaro Koskinen [tony@atomide.com: updated for combined board-zoom files] Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/board-omap3stalker.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'arch/arm/mach-omap2/board-omap3stalker.c') diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index f25272125413..ba65fe8a9e10 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c @@ -616,8 +616,6 @@ static struct omap_board_mux board_mux[] __initdata = { OMAP_PIN_OFF_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE), {.reg_offset = OMAP_MUX_TERMINATOR}, }; -#else -#define board_mux NULL #endif static struct omap_musb_board_data musb_board_data = { -- cgit v1.2.3-55-g7522