diff --git a/[refs] b/[refs]
index 8e7293c397f6..d0078dc473e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b04691c2b1661c7e64cd4222d7175b5bf87163f
+refs/heads/master: 2f229a31aac86ea6911d70ec4c79196ca711d625
diff --git a/trunk/sound/mips/hal2.c b/trunk/sound/mips/hal2.c
index c52691c2fc46..9a88cdfd952a 100644
--- a/trunk/sound/mips/hal2.c
+++ b/trunk/sound/mips/hal2.c
@@ -915,7 +915,7 @@ static int __devinit hal2_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int __exit hal2_remove(struct platform_device *pdev)
+static int __devexit hal2_remove(struct platform_device *pdev)
 {
 	struct snd_card *card = platform_get_drvdata(pdev);
 
diff --git a/trunk/sound/mips/sgio2audio.c b/trunk/sound/mips/sgio2audio.c
index e497525bc11b..8691f4cf6191 100644
--- a/trunk/sound/mips/sgio2audio.c
+++ b/trunk/sound/mips/sgio2audio.c
@@ -973,7 +973,7 @@ static int __devinit snd_sgio2audio_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int __exit snd_sgio2audio_remove(struct platform_device *pdev)
+static int __devexit snd_sgio2audio_remove(struct platform_device *pdev)
 {
 	struct snd_card *card = platform_get_drvdata(pdev);