summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-10 07:59:33 +0100
committerTakashi Iwai <tiwai@suse.de>2008-12-10 07:59:33 +0100
commitf73f2a6a23e34de9cca9672f727694e5af00e6c7 (patch)
tree43b867ada59a730dcd51b220db031dd8b6668919 /sound/soc
parentc9b3a40ff2b3dea9914e36965a17c802650bb603 (diff)
downloadop-kernel-dev-f73f2a6a23e34de9cca9672f727694e5af00e6c7.zip
op-kernel-dev-f73f2a6a23e34de9cca9672f727694e5af00e6c7.tar.gz
ALSA: ASoC - Fix symbol conflicts in omac-mcbsp.c
Add snd_ prefix to avoid the conflict of symbols in omac-mcbsp.c: sound/soc/omap/omap-mcbsp.c:503: error: static declaration of 'omap_mcbsp_init' follows non-static declaration arch/arm/plat-omap/include/mach/mcbsp.h:373: error: previous declaration of 'omap_mcbsp_init' was here Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/omap/omap-mcbsp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 39cc57c..7b86373 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -499,18 +499,18 @@ struct snd_soc_dai omap_mcbsp_dai[] = {
EXPORT_SYMBOL_GPL(omap_mcbsp_dai);
-static int __init omap_mcbsp_init(void)
+static int __init snd_omap_mcbsp_init(void)
{
return snd_soc_register_dais(omap_mcbsp_dai,
ARRAY_SIZE(omap_mcbsp_dai));
}
-module_init(omap_mcbsp_init);
+module_init(snd_omap_mcbsp_init);
-static void __exit omap_mcbsp_exit(void)
+static void __exit snd_omap_mcbsp_exit(void)
{
snd_soc_unregister_dais(omap_mcbsp_dai, ARRAY_SIZE(omap_mcbsp_dai));
}
-module_exit(omap_mcbsp_exit);
+module_exit(snd_omap_mcbsp_exit);
MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@nokia.com>");
MODULE_DESCRIPTION("OMAP I2S SoC Interface");
OpenPOWER on IntegriCloud