diff options
author | Tony Lindgren <tony@atomide.com> | 2013-02-05 13:36:21 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2013-02-05 13:36:21 -0500 |
commit | 6689c87555839d90f2a0b76d1f982713487a11d2 (patch) | |
tree | 316d95530226ef29b0342a309ffce432b2f9226d | |
parent | 27e0bf7701a63f7e125f437bb549f236e2118577 (diff) |
ARM: OMAP2+: Fix twl section warnings related to omap_twl4030_audio_init
With the recent twl related changes we can now get:
WARNING: arch/arm/mach-omap2/built-in.o(.text+0x15f88): Section mismatch in
reference from the function sdp3430_twl_gpio_setup() to the function
.init.text:omap_twl4030_audio_init()
The function sdp3430_twl_gpio_setup() references
the function __init omap_twl4030_audio_init().
This is often because sdp3430_twl_gpio_setup lacks a __init
annotation or the annotation of omap_twl4030_audio_init is wrong.
WARNING: arch/arm/mach-omap2/built-in.o(.text+0x16968): Section mismatch in
reference from the function zoom_twl_gpio_setup() to the function
.init.text:omap_twl4030_audio_init()
The function zoom_twl_gpio_setup() references
the function __init omap_twl4030_audio_init().
This is often because zoom_twl_gpio_setup lacks a __init
annotation or the annotation of omap_twl4030_audio_init is wrong.
Fix this by removing __init from omap_twl4030_audio_init() as
suggested by Peter Ujfalusi <peter.ujfalusi@ti.com>.
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/mach-omap2/twl-common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c index 931495a25872..62cf40b86e4a 100644 --- a/arch/arm/mach-omap2/twl-common.c +++ b/arch/arm/mach-omap2/twl-common.c | |||
@@ -536,7 +536,7 @@ static struct platform_device audio_device = { | |||
536 | .id = -1, | 536 | .id = -1, |
537 | }; | 537 | }; |
538 | 538 | ||
539 | void __init omap_twl4030_audio_init(char *card_name, | 539 | void omap_twl4030_audio_init(char *card_name, |
540 | struct omap_tw4030_pdata *pdata) | 540 | struct omap_tw4030_pdata *pdata) |
541 | { | 541 | { |
542 | if (!pdata) | 542 | if (!pdata) |
@@ -549,7 +549,7 @@ void __init omap_twl4030_audio_init(char *card_name, | |||
549 | } | 549 | } |
550 | 550 | ||
551 | #else /* SOC_OMAP_TWL4030 */ | 551 | #else /* SOC_OMAP_TWL4030 */ |
552 | void __init omap_twl4030_audio_init(char *card_name, | 552 | void omap_twl4030_audio_init(char *card_name, |
553 | struct omap_tw4030_pdata *pdata) | 553 | struct omap_tw4030_pdata *pdata) |
554 | { | 554 | { |
555 | return; | 555 | return; |