From e6c9f74a138035b7c7d71df2d6b835dae28cce84 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 9 Dec 2008 14:47:07 +0000
Subject: [PATCH] --- yaml --- r: 120301 b: refs/heads/master c:
 471716f7ea646487b7b5c7b3efc68a023b05a933 h: refs/heads/master i:   120299:
 c214e3fc549138a7d2daad85862afe547c843bbb v: v3

---
 [refs]                                | 2 +-
 trunk/sound/soc/atmel/atmel-pcm.c     | 2 +-
 trunk/sound/soc/atmel/atmel_ssc_dai.c | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2a29f527c355..ef8261a418d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0752331b89ce79063f765545dd7dd5f49d9a713
+refs/heads/master: 471716f7ea646487b7b5c7b3efc68a023b05a933
diff --git a/trunk/sound/soc/atmel/atmel-pcm.c b/trunk/sound/soc/atmel/atmel-pcm.c
index d6bcb4e6fda0..027eb13f9dd0 100644
--- a/trunk/sound/soc/atmel/atmel-pcm.c
+++ b/trunk/sound/soc/atmel/atmel-pcm.c
@@ -483,7 +483,7 @@ static int __devinit atmel_pcm_modinit(void)
 }
 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);
 }
diff --git a/trunk/sound/soc/atmel/atmel_ssc_dai.c b/trunk/sound/soc/atmel/atmel_ssc_dai.c
index c9f02edd7308..87904b6ab8c2 100644
--- a/trunk/sound/soc/atmel/atmel_ssc_dai.c
+++ b/trunk/sound/soc/atmel/atmel_ssc_dai.c
@@ -776,12 +776,13 @@ static int __devinit atmel_ssc_modinit(void)
 {
 	return snd_soc_register_dais(atmel_ssc_dai, ARRAY_SIZE(atmel_ssc_dai));
 }
-module_init(snd_soc_init);
+module_init(atmel_ssc_modinit);
 
-static void __exit snd_soc_exit(void)
+static void __exit atmel_ssc_modexit(void)
 {
 	snd_soc_unregister_dais(atmel_ssc_dai, ARRAY_SIZE(atmel_ssc_dai));
 }
+module_exit(atmel_ssc_modexit);
 
 /* Module information */
 MODULE_AUTHOR("Sedji Gaouaou, sedji.gaouaou@atmel.com, www.atmel.com");