Merge with 2.3.99-pre1.

1 files changed, 6 insertions, 11 deletions

diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index 31d4c99c7..4c9fa16a3 100644
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -1267,22 +1267,17 @@ int minix_sync_inode(struct inode * inode)
 
 static DECLARE_FSTYPE_DEV(minix_fs_type,"minix",minix_read_super);
 
-int __init init_minix_fs(void)
+static int __init init_minix_fs(void)
 {
         return register_filesystem(&minix_fs_type);
 }
 
-#ifdef MODULE
-EXPORT_NO_SYMBOLS;
-
-int init_module(void)
+static void __exit exit_minix_fs(void)
 {
-	return init_minix_fs();
+        unregister_filesystem(&minix_fs_type);
 }
 
-void cleanup_module(void)
-{
-	unregister_filesystem(&minix_fs_type);
-}
+EXPORT_NO_SYMBOLS;
 
-#endif
+module_init(init_minix_fs)
+module_exit(exit_minix_fs)