diff options
| author |   Aaro Koskinen <Aaro.Koskinen@nokia.com> | 2010-12-02 13:25:40 +0000 |
|---|---|---|
| committer |   Tony Lindgren <tony@atomide.com> | 2010-12-02 17:03:41 -0800 |
| commit | 7203f8a48bb63015ebe58a6f2a38aec1cb208b9d (patch) | |
| tree | f421e66b49f699ab397497f90739df3281a18f25 /arch/arm/mach-omap2/board-rx51.c | |
| parent | Merge branch 'ctrl-wip/mux-omap4-v4' of git://gitorious.org/omap-pm/linux into omap-for-linus (diff) | |
| download | linux-dev-7203f8a48bb63015ebe58a6f2a38aec1cb208b9d.tar.xz linux-dev-7203f8a48bb63015ebe58a6f2a38aec1cb208b9d.zip | |
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-rx51.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index 36f2cf4efd57..f3b6e103b01c 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c @@ -117,8 +117,6 @@ extern void __init rx51_peripherals_init(void); static struct omap_board_mux board_mux[] __initdata = { { .reg_offset = OMAP_MUX_TERMINATOR }, }; -#else -#define board_mux NULL #endif static struct omap_musb_board_data musb_board_data = { |