diff --git a/[refs] b/[refs]
index cacf76de18df..f25d067b1434 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 076c0e4fd80a43f64710fe9aabdc4c463b7f8621
+refs/heads/master: 3c2b576d58b4542b1adc56cbfb92dbfa5eef89ee
diff --git a/trunk/sound/drivers/portman2x4.c b/trunk/sound/drivers/portman2x4.c
index 497cafb57d9b..0eb9b5cebfcd 100644
--- a/trunk/sound/drivers/portman2x4.c
+++ b/trunk/sound/drivers/portman2x4.c
@@ -833,7 +833,7 @@ static struct platform_driver snd_portman_driver = {
 /*********************************************************************
  * module init stuff
  *********************************************************************/
-static void __init_or_module snd_portman_unregister_all(void)
+static void snd_portman_unregister_all(void)
 {
 	int i;