diff options
| author | Aaro Koskinen | 2010-12-02 14:25:40 +0100 |
|---|---|---|
| committer | Tony Lindgren | 2010-12-03 02:03:41 +0100 |
| commit | 7203f8a48bb63015ebe58a6f2a38aec1cb208b9d (patch) | |
| tree | f421e66b49f699ab397497f90739df3281a18f25 /arch/arm/mach-omap2/board-omap3stalker.c | |
| parent | Merge branch 'ctrl-wip/mux-omap4-v4' of git://gitorious.org/omap-pm/linux int... (diff) | |
| download | kernel-qcow2-linux-7203f8a48bb63015ebe58a6f2a38aec1cb208b9d.tar.gz kernel-qcow2-linux-7203f8a48bb63015ebe58a6f2a38aec1cb208b9d.tar.xz kernel-qcow2-linux-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-omap3stalker.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3stalker.c | 2 |
1 files changed, 0 insertions, 2 deletions
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 = { |