Merge with 2.3.99-pre1.

1 files changed, 7 insertions, 12 deletions

diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c
index 349eec589..f6ff5e420 100644
--- a/fs/ncpfs/inode.c
+++ b/fs/ncpfs/inode.c
@@ -698,15 +698,7 @@ int ncp_current_malloced;
 
 static DECLARE_FSTYPE(ncp_fs_type, "ncpfs", ncp_read_super, 0);
 
-int __init init_ncp_fs(void)
-{
-	return register_filesystem(&ncp_fs_type);
-}
-
-#ifdef MODULE
-EXPORT_NO_SYMBOLS;
-
-int init_module(void)
+static int __init init_ncp_fs(void)
 {
 	DPRINTK("ncpfs: init_module called\n");
 
@@ -714,10 +706,10 @@ int init_module(void)
 	ncp_malloced = 0;
 	ncp_current_malloced = 0;
 #endif
-	return init_ncp_fs();
+	return register_filesystem(&ncp_fs_type);
 }
 
-void cleanup_module(void)
+static void __exit exit_ncp_fs(void)
 {
 	DPRINTK("ncpfs: cleanup_module called\n");
 	unregister_filesystem(&ncp_fs_type);
@@ -727,4 +719,7 @@ void cleanup_module(void)
 #endif
 }
 
-#endif
+EXPORT_NO_SYMBOLS;
+
+module_init(init_ncp_fs)
+module_exit(exit_ncp_fs)