Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[pandora-kernel.git] / sound / soc / atmel / atmel-pcm.c

diff --git a/sound/soc/atmel/atmel-pcm.c b/sound/soc/atmel/atmel-pcm.c
index d6bcb4e..1fac5ef 100644 (file)
--- a/sound/soc/atmel/atmel-pcm.c
+++ b/sound/soc/atmel/atmel-pcm.c
@@ -477,13 +477,13 @@ struct snd_soc_platform atmel_soc_platform = {
 };
 EXPORT_SYMBOL_GPL(atmel_soc_platform);
 
-static int __devinit atmel_pcm_modinit(void)
+static int __init atmel_pcm_modinit(void)
 {
        return snd_soc_register_platform(&atmel_soc_platform);
 }
 module_init(atmel_pcm_modinit);
 
-static void __exit atmel_pcm_exit(void)
+static void __exit atmel_pcm_modexit(void)
 {
        snd_soc_unregister_platform(&atmel_soc_platform);
 }