* [PATCH] ARM: OMAP2+: twl-common: Fix compile time error when omap-twl4030 audio is not enabled
@ 2012-08-23 6:35 Peter Ujfalusi
2012-08-23 11:22 ` Mark Brown
2012-08-23 14:39 ` Mark Brown
0 siblings, 2 replies; 5+ messages in thread
From: Peter Ujfalusi @ 2012-08-23 6:35 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood, Tony Lindgren
Cc: linux-omap, linux-arm-kernel, linux-next, Brian Austin, alsa-devel
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] ARM: OMAP2+: twl-common: Fix compile time error when omap-twl4030 audio is not enabled
2012-08-23 6:35 [PATCH] ARM: OMAP2+: twl-common: Fix compile time error when omap-twl4030 audio is not enabled Peter Ujfalusi
@ 2012-08-23 11:22 ` Mark Brown
2012-08-23 12:14 ` Austin, Brian
2012-08-23 12:25 ` Peter Ujfalusi
2012-08-23 14:39 ` Mark Brown
1 sibling, 2 replies; 5+ messages in thread
From: Mark Brown @ 2012-08-23 11:22 UTC (permalink / raw)
To: Peter Ujfalusi
Cc: Liam Girdwood, Tony Lindgren, linux-omap, linux-arm-kernel,
linux-next, Brian Austin, alsa-devel
[-- Attachment #1: Type: text/plain, Size: 520 bytes --]
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?
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ARM: OMAP2+: twl-common: Fix compile time error when omap-twl4030 audio is not enabled
2012-08-23 11:22 ` Mark Brown
@ 2012-08-23 12:14 ` Austin, Brian
2012-08-23 12:25 ` Peter Ujfalusi
1 sibling, 0 replies; 5+ messages in thread
From: Austin, Brian @ 2012-08-23 12:14 UTC (permalink / raw)
To: Mark Brown
Cc: alsa-devel, Tony Lindgren, Peter Ujfalusi, linux-next,
linux-omap, Liam Girdwood, linux-arm-kernel
> Which branch needs this?
for-next for sure, haven't tested on any other
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ARM: OMAP2+: twl-common: Fix compile time error when omap-twl4030 audio is not enabled
2012-08-23 11:22 ` Mark Brown
2012-08-23 12:14 ` Austin, Brian
@ 2012-08-23 12:25 ` Peter Ujfalusi
1 sibling, 0 replies; 5+ messages in thread
From: Peter Ujfalusi @ 2012-08-23 12:25 UTC (permalink / raw)
To: Mark Brown
Cc: Brian Austin, Tony Lindgren, alsa-devel, linux-next, linux-omap,
Liam Girdwood, linux-arm-kernel
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.
--
Péter
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] ARM: OMAP2+: twl-common: Fix compile time error when omap-twl4030 audio is not enabled
2012-08-23 6:35 [PATCH] ARM: OMAP2+: twl-common: Fix compile time error when omap-twl4030 audio is not enabled Peter Ujfalusi
2012-08-23 11:22 ` Mark Brown
@ 2012-08-23 14:39 ` Mark Brown
1 sibling, 0 replies; 5+ messages in thread
From: Mark Brown @ 2012-08-23 14:39 UTC (permalink / raw)
To: Peter Ujfalusi
Cc: Brian Austin, Tony Lindgren, alsa-devel, linux-next, linux-omap,
Liam Girdwood, linux-arm-kernel
[-- Attachment #1.1: Type: text/plain, Size: 448 bytes --]
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.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-08-23 14:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-23 6:35 [PATCH] ARM: OMAP2+: twl-common: Fix compile time error when omap-twl4030 audio is not enabled Peter Ujfalusi
2012-08-23 11:22 ` Mark Brown
2012-08-23 12:14 ` Austin, Brian
2012-08-23 12:25 ` Peter Ujfalusi
2012-08-23 14:39 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).