From: Peter Ujfalusi <peter.ujfalusi@ti•com>
To: Mark Brown <broonie@opensource•wolfsonmicro.com>,
Liam Girdwood <lrg@ti•com>, Tony Lindgren <tony@atomide•com>
Cc: linux-omap@vger•kernel.org, linux-arm-kernel@lists•infradead.org,
linux-next@vger•kernel.org,
Brian Austin <brian.austin@cirrus•com>,
alsa-devel@alsa-project•org
Subject: [PATCH] ARM: OMAP2+: twl-common: Fix compile time error when omap-twl4030 audio is not enabled
Date: Thu, 23 Aug 2012 09:35:01 +0300 [thread overview]
Message-ID: <1345703701-27283-1-git-send-email-peter.ujfalusi@ti.com> (raw)
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(-)
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;
}
--
1.7.8.6
next reply other threads:[~2012-08-23 6:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-23 6:35 Peter Ujfalusi [this message]
2012-08-23 11:22 ` [PATCH] ARM: OMAP2+: twl-common: Fix compile time error when omap-twl4030 audio is not enabled Mark Brown
2012-08-23 12:14 ` Austin, Brian
2012-08-23 12:25 ` Peter Ujfalusi
2012-08-23 14:39 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1345703701-27283-1-git-send-email-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti$(echo .)com \
--cc=alsa-devel@alsa-project$(echo .)org \
--cc=brian.austin@cirrus$(echo .)com \
--cc=broonie@opensource$(echo .)wolfsonmicro.com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-omap@vger$(echo .)kernel.org \
--cc=lrg@ti$(echo .)com \
--cc=tony@atomide$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox