aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-10 01:59:33 -0500
committerTakashi Iwai <tiwai@suse.de>2008-12-10 01:59:33 -0500
commitf73f2a6a23e34de9cca9672f727694e5af00e6c7 (patch)
tree43b867ada59a730dcd51b220db031dd8b6668919 /sound/soc
parentc9b3a40ff2b3dea9914e36965a17c802650bb603 (diff)
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 39cc57ce4bf..7b86373007c 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[] = {
499 499
500EXPORT_SYMBOL_GPL(omap_mcbsp_dai); 500EXPORT_SYMBOL_GPL(omap_mcbsp_dai);
501 501
502static int __init omap_mcbsp_init(void) 502static int __init snd_omap_mcbsp_init(void)
503{ 503{
504 return snd_soc_register_dais(omap_mcbsp_dai, 504 return snd_soc_register_dais(omap_mcbsp_dai,
505 ARRAY_SIZE(omap_mcbsp_dai)); 505 ARRAY_SIZE(omap_mcbsp_dai));
506} 506}
507module_init(omap_mcbsp_init); 507module_init(snd_omap_mcbsp_init);
508 508
509static void __exit omap_mcbsp_exit(void) 509static void __exit snd_omap_mcbsp_exit(void)
510{ 510{
511 snd_soc_unregister_dais(omap_mcbsp_dai, ARRAY_SIZE(omap_mcbsp_dai)); 511 snd_soc_unregister_dais(omap_mcbsp_dai, ARRAY_SIZE(omap_mcbsp_dai));
512} 512}
513module_exit(omap_mcbsp_exit); 513module_exit(snd_omap_mcbsp_exit);
514 514
515MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@nokia.com>"); 515MODULE_AUTHOR("Jarkko Nikula <jarkko.nikula@nokia.com>");
516MODULE_DESCRIPTION("OMAP I2S SoC Interface"); 516MODULE_DESCRIPTION("OMAP I2S SoC Interface");