From: Tony Lindgren <tony@atomide.com>
Date: Thu, 23 Feb 2012 22:21:28 +0000 (-0800)
Subject: ARM: OMAP2+: Fix board_mux section type conflict when OMAP_MUX is not set
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cc4915d8a0bbe6825eb9fc2c687a0151441af7db;p=mv-sheeva.git

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>
---

diff --git a/arch/arm/mach-omap2/mux.h b/arch/arm/mach-omap2/mux.h
index 2132308ad1e..69fe060a0b7 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