At Wed, 10 Dec 2008 16:23:09 +1100,
Stephen Rothwell wrote:
>
> Hi Takashi,
>
> Today's linux-next build (powerpc allyesconfig) failed like this:
>
> sound/soc/codecs/twl4030.c:1278: error: conflicting types for 'twl4030_init'
> sound/soc/codecs/twl4030.c:1187: error: previous definition of 'twl4030_init' was here
>
> Caused by commit 64089b84abfe2f26a864ebd968429302dcb071de ("ASoC:
> Register non-AC97 codec DAIs").
>
> I have reverted the sound tree for today.
Thanks for noticing. I fixed it on sound git tree now.
FWIW, the patch below should fix the build problem.
thanks,
Takashi
===
>From 24e07db8cceb7dfe2d4005e4450a27f4bcda6499 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Wed, 10 Dec 2008 07:40:24 +0100
Subject: [PATCH] ALSA: ASoC - Fix module init entry for twl4030.c
Fixed the function name of module init entry for twl4030.c, which
conflicted with the existing hardware init function:
sound/soc/codecs/twl4030.c:1278: error: conflicting types for 'twl4030_init'
sound/soc/codecs/twl4030.c:1187: error: previous definition of 'twl4030_init' was here
Also fixed the section type of init function.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
---
sound/soc/codecs/twl4030.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 373daa4..71ab534 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -1275,11 +1275,11 @@ struct snd_soc_codec_device soc_codec_dev_twl4030 = {
};
EXPORT_SYMBOL_GPL(soc_codec_dev_twl4030);
-static int __devinit twl4030_init(void)
+static int __init twl4030_modinit(void)
{
return snd_soc_register_dai(&twl4030_dai);
}
-module_init(twl4030_init);
+module_init(twl4030_modinit);
static void __exit twl4030_exit(void)
{
--
1.6.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
