diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-23 14:21:28 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-23 16:44:34 -0800 |
| commit | cc4915d8a0bbe6825eb9fc2c687a0151441af7db (patch) | |
| tree | fb6252d8dbda61818670e5ed9950a8100735c37e /arch/arm/mach-omap2/mux.h | |
| parent | e3a98fe11b296b833ac540fbc19f407c790fdc05 (diff) | |
| download | talos-obmc-linux-cc4915d8a0bbe6825eb9fc2c687a0151441af7db.tar.gz talos-obmc-linux-cc4915d8a0bbe6825eb9fc2c687a0151441af7db.zip | |
ARM: OMAP2+: Fix board_mux section type conflict when OMAP_MUX is not set
Otherwise we can get:
arch/arm/mach-omap2/mux.h:249:31: error: board_mux causes a section type conflict
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.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/mux.h b/arch/arm/mach-omap2/mux.h index 2132308ad1e4..69fe060a0b75 100644 --- a/arch/arm/mach-omap2/mux.h +++ b/arch/arm/mach-omap2/mux.h @@ -246,7 +246,7 @@ static inline void omap_hwmod_mux(struct omap_hwmod_mux_info *hmux, u8 state) { } -static struct omap_board_mux *board_mux __initdata __maybe_unused; +static struct omap_board_mux *board_mux __maybe_unused; #endif |
