summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-10 07:40:24 +0100
committerTakashi Iwai <tiwai@suse.de>2008-12-10 07:40:24 +0100
commit24e07db8cceb7dfe2d4005e4450a27f4bcda6499 (patch)
tree4259c0b4173d15fa68b7c314b59303cad21727f4 /sound/soc
parent471716f7ea646487b7b5c7b3efc68a023b05a933 (diff)
downloadop-kernel-dev-24e07db8cceb7dfe2d4005e4450a27f4bcda6499.zip
op-kernel-dev-24e07db8cceb7dfe2d4005e4450a27f4bcda6499.tar.gz
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@suse.de>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/twl4030.c4
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)
{
OpenPOWER on IntegriCloud