diff --git a/[refs] b/[refs]
index 62f798cf7e9a..b6ae6068ec7a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9b3a40ff2b3dea9914e36965a17c802650bb603
+refs/heads/master: f73f2a6a23e34de9cca9672f727694e5af00e6c7
diff --git a/trunk/sound/soc/omap/omap-mcbsp.c b/trunk/sound/soc/omap/omap-mcbsp.c
index 39cc57ce4bfd..7b86373007ca 100644
--- a/trunk/sound/soc/omap/omap-mcbsp.c
+++ b/trunk/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");