diff --git a/[refs] b/[refs]
index bf9b5a95f640..9cf8be8dd194 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8009882e9f5e1a76986c741f071edd2ad760c97
+refs/heads/master: de30d36be171c05dfd66fa49e3d785e004f5ecdf
diff --git a/trunk/sound/sound_core.c b/trunk/sound/sound_core.c
index 68614c3ed541..4ae07e236b36 100644
--- a/trunk/sound/sound_core.c
+++ b/trunk/sound/sound_core.c
@@ -13,7 +13,7 @@
 
 #ifdef CONFIG_SOUND_OSS_CORE
 static int __init init_oss_soundcore(void);
-static void __exit cleanup_oss_soundcore(void);
+static void cleanup_oss_soundcore(void);
 #else
 static inline int init_oss_soundcore(void)	{ return 0; }
 static inline void cleanup_oss_soundcore(void)	{ }
@@ -574,7 +574,7 @@ int soundcore_open(struct inode *inode, struct file *file)
 
 MODULE_ALIAS_CHARDEV_MAJOR(SOUND_MAJOR);
 
-static void __exit cleanup_oss_soundcore(void)
+static void cleanup_oss_soundcore(void)
 {
 	/* We have nothing to really do here - we know the lists must be
 	   empty */