aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/mux.h
diff options
context:
space:
mode:
authorAaro Koskinen <Aaro.Koskinen@nokia.com>2010-12-02 08:25:40 -0500
committerTony Lindgren <tony@atomide.com>2010-12-02 20:03:41 -0500
commit7203f8a48bb63015ebe58a6f2a38aec1cb208b9d (patch)
treef421e66b49f699ab397497f90739df3281a18f25 /arch/arm/mach-omap2/mux.h
parent52aa8c539dad56728527de664f368915ff44badf (diff)
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 <aaro.koskinen@nokia.com> [tony@atomide.com: updated for combined board-zoom files] Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/mux.h')
-rw-r--r--arch/arm/mach-omap2/mux.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/mux.h b/arch/arm/mach-omap2/mux.h
index 79076d61d399..f5f7f4938057 100644
--- a/arch/arm/mach-omap2/mux.h
+++ b/arch/arm/mach-omap2/mux.h
@@ -172,6 +172,8 @@ static inline int omap_mux_init_signal(char *muxname, int val)
172 return 0; 172 return 0;
173} 173}
174 174
175static struct omap_board_mux *board_mux __initdata __maybe_unused;
176
175#endif 177#endif
176 178
177/** 179/**