]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
ARM: OMAP2+: Fix board_mux section type conflict when OMAP_MUX is not set
authorTony Lindgren <tony@atomide.com>
Thu, 23 Feb 2012 22:21:28 +0000 (14:21 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 24 Feb 2012 00:44:34 +0000 (16:44 -0800)
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>
arch/arm/mach-omap2/mux.h

index 2132308ad1e41fffc14856b48294ffd42e748c8b..69fe060a0b755204875f42a9fd1e1ffc943736f9 100644 (file)
@@ -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