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>
This commit is contained in:
parent
c9b3a40ff2
commit
f73f2a6a23
|
@ -499,18 +499,18 @@ struct snd_soc_dai omap_mcbsp_dai[] = {
|
||||||
|
|
||||||
EXPORT_SYMBOL_GPL(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,
|
return snd_soc_register_dais(omap_mcbsp_dai,
|
||||||
ARRAY_SIZE(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));
|
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_AUTHOR("Jarkko Nikula <jarkko.nikula@nokia.com>");
|
||||||
MODULE_DESCRIPTION("OMAP I2S SoC Interface");
|
MODULE_DESCRIPTION("OMAP I2S SoC Interface");
|
||||||
|
|
Loading…
Reference in New Issue