Merge branch 'upstream-fixes' into upstream

git-mirror · May 26, 2006 · b1141f6 · b1141f6
2 parents f587fb7 + 4541a5d
commit b1141f6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c
@@ -1838,7 +1838,7 @@ struct net_device * __init arlan_probe(int unit)
 }
 
 #ifdef  MODULE
-int init_module(void)
+int __init init_module(void)
 {
 	int i = 0;
 
@@ -1860,7 +1860,7 @@ int init_module(void)
 }
 
 
-void cleanup_module(void)
+void __exit cleanup_module(void)
 {
 	int i = 0;
 	struct net_device *dev;

diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c
@@ -4306,7 +4306,7 @@ struct net_device * __init wavelan_probe(int unit)
  * Insertion of the module
  * I'm now quite proud of the multi-device support.
  */
-int init_module(void)
+int __init init_module(void)
 {
 	int ret = -EIO;		/* Return error if no cards found */
 	int i;