Merge with 2.3.99-pre1.

1 files changed, 6 insertions, 25 deletions

diff --git a/fs/nls/nls_cp874.c b/fs/nls/nls_cp874.c
index 108a7045e..a40b6b07b 100644
--- a/fs/nls/nls_cp874.c
+++ b/fs/nls/nls_cp874.c
@@ -283,46 +283,27 @@ static unsigned char charset2upper[256] = {
 	0xf8, 0xf9, 0xfa, 0xfb, 0x00, 0x00, 0x00, 0x00, /* 0xf8-0xff */
 };
 
-
-static void inc_use_count(void)
-{
-	MOD_INC_USE_COUNT;
-}
-
-static void dec_use_count(void)
-{
-	MOD_DEC_USE_COUNT;
-}
-
 static struct nls_table table = {
 	"cp874",
 	page_uni2charset,
 	charset2uni,
 	charset2lower,
 	charset2upper,
-	inc_use_count,
-	dec_use_count,
-	NULL
+	THIS_MODULE,
 };
 
-int init_nls_cp874(void)
+static int __init init_nls_cp874(void)
 {
 	return register_nls(&table);
 }
 
-#ifdef MODULE
-int init_module(void)
-{
-	return init_nls_cp874();
-}
-
-
-void cleanup_module(void)
+static void __exit exit_nls_cp874(void)
 {
 	unregister_nls(&table);
-	return;
 }
-#endif
+
+module_init(init_nls_cp874)
+module_exit(exit_nls_cp874)
 
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.