Patchwork ARM: OMAP2+: twl-common: Fix compile time error when omap-twl4030 audio is not enabled

login
register
mail settings
Submitter Péter Ujfalusi
Date Aug. 23, 2012, 6:35 a.m.
Message ID <1345703701-27283-1-git-send-email-peter.ujfalusi@ti.com>
Download mbox | patch
Permalink /patch/179517/
State New
Headers show

Comments

Péter Ujfalusi - Aug. 23, 2012, 6:35 a.m.
Fixes:
CC      arch/arm/mach-omap2/twl-common.o arch/arm/mach-omap2/twl-common.c:562: error: conflicting types for ‘omap_twl4030_audio_init’
arch/arm/mach-omap2/twl-common.h:62: error: previous declaration of ‘omap_twl4030_audio_init’ was here
make[1]: *** [arch/arm/mach-omap2/twl-common.o] Error 1
make: *** [arch/arm/mach-omap2] Error 2

When building the kernel with !SND_OMAP_SOC_OMAP_TWL4030

Reported-by: Brian Austin <brian.austin@cirrus.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
 arch/arm/mach-omap2/twl-common.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Mark Brown - Aug. 23, 2012, 11:22 a.m.
On Thu, Aug 23, 2012 at 09:35:01AM +0300, Peter Ujfalusi wrote:
> Fixes:
> CC      arch/arm/mach-omap2/twl-common.o arch/arm/mach-omap2/twl-common.c:562: error: conflicting types for ‘omap_twl4030_audio_init’
> arch/arm/mach-omap2/twl-common.h:62: error: previous declaration of ‘omap_twl4030_audio_init’ was here
> make[1]: *** [arch/arm/mach-omap2/twl-common.o] Error 1
> make: *** [arch/arm/mach-omap2] Error 2
> 
> When building the kernel with !SND_OMAP_SOC_OMAP_TWL4030

Which branch needs this?
Austin, Brian - Aug. 23, 2012, 12:14 p.m.
> Which branch needs this?

for-next for sure, haven't tested on any other
Péter Ujfalusi - Aug. 23, 2012, 12:25 p.m.
On 08/23/2012 02:22 PM, Mark Brown wrote:
> Which branch needs this?

for-3.7, for-next and topic/omap needs this patch.
Mark Brown - Aug. 23, 2012, 2:39 p.m.
On Thu, Aug 23, 2012 at 09:35:01AM +0300, Peter Ujfalusi wrote:
> Fixes:
> CC      arch/arm/mach-omap2/twl-common.o arch/arm/mach-omap2/twl-common.c:562: error: conflicting types for ‘omap_twl4030_audio_init’
> arch/arm/mach-omap2/twl-common.h:62: error: previous declaration of ‘omap_twl4030_audio_init’ was here
> make[1]: *** [arch/arm/mach-omap2/twl-common.o] Error 1
> make: *** [arch/arm/mach-omap2] Error 2

Applied, thanks.

Patch

diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c
index 1c6045a..2919d7a 100644
--- a/arch/arm/mach-omap2/twl-common.c
+++ b/arch/arm/mach-omap2/twl-common.c
@@ -544,7 +544,7 @@  void __init omap_twl4030_audio_init(char *card_name)
 }
 
 #else /* SOC_OMAP_TWL4030 */
-void __init omap_twl4030_audio_init(char *card_name, int codec_sysclk)
+void __init omap_twl4030_audio_init(char *card_name)
 {
 	return;
 }