diff options
author | Aaro Koskinen <Aaro.Koskinen@nokia.com> | 2010-12-02 08:25:40 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-12-02 20:03:41 -0500 |
commit | 7203f8a48bb63015ebe58a6f2a38aec1cb208b9d (patch) | |
tree | f421e66b49f699ab397497f90739df3281a18f25 /arch/arm/mach-omap2/board-omap3pandora.c | |
parent | 52aa8c539dad56728527de664f368915ff44badf (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/board-omap3pandora.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3pandora.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index 89ed1be2d62e..445b15843212 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c | |||
@@ -711,8 +711,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { | |||
711 | static struct omap_board_mux board_mux[] __initdata = { | 711 | static struct omap_board_mux board_mux[] __initdata = { |
712 | { .reg_offset = OMAP_MUX_TERMINATOR }, | 712 | { .reg_offset = OMAP_MUX_TERMINATOR }, |
713 | }; | 713 | }; |
714 | #else | ||
715 | #define board_mux NULL | ||
716 | #endif | 714 | #endif |
717 | 715 | ||
718 | static struct omap_musb_board_data musb_board_data = { | 716 | static struct omap_musb_board_data musb_board_data = { |