projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e3a98fe
)
ARM: OMAP2+: Fix board_mux section type conflict when OMAP_MUX is not set
author
Tony Lindgren
<tony@atomide.com>
Thu, 23 Feb 2012 22:21:28 +0000
(14:21 -0800)
committer
Tony 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
patch
|
blob
|
history
diff --git
a/arch/arm/mach-omap2/mux.h
b/arch/arm/mach-omap2/mux.h
index
2132308
..
69fe060
100644
(file)
--- 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