patch-2.4.0-test12 linux/drivers/isdn/avmb1/capifs.c

• Lines: 80
• Date: Tue Nov 28 21:44:41 2000
• Orig file: v2.4.0-test11/linux/drivers/isdn/avmb1/capifs.c
• Orig date: Sun Nov 19 18:44:08 2000

diff -u --recursive --new-file v2.4.0-test11/linux/drivers/isdn/avmb1/capifs.c linux/drivers/isdn/avmb1/capifs.c
@@ -1,11 +1,32 @@
 /*
- * $Id: capifs.c,v 1.10 2000/10/12 10:12:35 calle Exp $
+ * $Id: capifs.c,v 1.14.6.1 2000/11/28 12:02:45 kai Exp $
  * 
  * (c) Copyright 2000 by Carsten Paeth (calle@calle.de)
  *
  * Heavily based on devpts filesystem from H. Peter Anvin
  * 
  * $Log: capifs.c,v $
+ * Revision 1.14.6.1  2000/11/28 12:02:45  kai
+ * MODULE_DEVICE_TABLE for 2.4
+ *
+ * Revision 1.14.2.1  2000/11/26 17:47:53  kai
+ * added PCI_DEV_TABLE for 2.4
+ *
+ * Revision 1.14  2000/11/23 20:45:14  kai
+ * fixed module_init/exit stuff
+ * Note: compiled-in kernel doesn't work pre 2.2.18 anymore.
+ *
+ * Revision 1.13  2000/11/18 16:17:25  kai
+ * change from 2.4 tree
+ *
+ * Revision 1.12  2000/11/01 14:05:02  calle
+ * - use module_init/module_exit from linux/init.h.
+ * - all static struct variables are initialized with "membername:" now.
+ * - avm_cs.c, let it work with newer pcmcia-cs.
+ *
+ * Revision 1.11  2000/10/24 15:08:47  calle
+ * Too much includes.
+ *
  * Revision 1.10  2000/10/12 10:12:35  calle
  * Bugfix: second iput(inode) on umount, destroies a foreign inode.
  *
@@ -72,7 +93,7 @@
 
 MODULE_AUTHOR("Carsten Paeth <calle@calle.de>");
 
-static char *revision = "$Revision: 1.10 $";
+static char *revision = "$Revision: 1.14.6.1 $";
 
 struct capifs_ncci {
 	struct inode *inode;
@@ -558,7 +579,7 @@
 	}
 }
 
-int __init capifs_init(void)
+static int __init capifs_init(void)
 {
 	char rev[10];
 	char *p;
@@ -587,7 +608,7 @@
 	return 0;
 }
 
-void capifs_exit(void)
+static void __exit capifs_exit(void)
 {
 	unregister_filesystem(&capifs_fs_type);
 }
@@ -595,16 +616,5 @@
 EXPORT_SYMBOL(capifs_new_ncci);
 EXPORT_SYMBOL(capifs_free_ncci);
 
-#ifdef MODULE
-
-int init_module(void)
-{
-	return capifs_init();
-}
-
-void cleanup_module(void)
-{
-	capifs_exit();
-}
-
-#endif
+module_init(capifs_init);
+module_exit(capifs_exit);