diff -urN linux-2.4.17-rc2/drivers/net/dmfe.c linux-2.4.17-rc2-devexit-fix/drivers/net/dmfe.c
--- linux-2.4.17-rc2/drivers/net/dmfe.c	Wed Dec 19 12:58:08 2001
+++ linux-2.4.17-rc2-devexit-fix/drivers/net/dmfe.c	Wed Dec 19 18:56:03 2001
@@ -527,7 +527,7 @@
 }
 
 
-static void __devexit dmfe_remove_one (struct pci_dev *pdev)
+static void __exit dmfe_remove_one (struct pci_dev *pdev)
 {
 	struct net_device *dev = pci_get_drvdata(pdev);
 	struct dmfe_board_info *db = dev->priv;
@@ -2059,7 +2059,7 @@
 	name:		"dmfe",
 	id_table:	dmfe_pci_tbl,
 	probe:		dmfe_init_one,
-	remove:		__devexit_p(dmfe_remove_one),
+	remove:		dmfe_remove_one,
 };
 
 MODULE_AUTHOR("Sten Wang, sten_wang@davicom.com.tw");
diff -urN linux-2.4.17-rc2/drivers/net/hamachi.c linux-2.4.17-rc2-devexit-fix/drivers/net/hamachi.c
--- linux-2.4.17-rc2/drivers/net/hamachi.c	Wed Dec 19 12:58:08 2001
+++ linux-2.4.17-rc2-devexit-fix/drivers/net/hamachi.c	Wed Dec 19 18:56:03 2001
@@ -1981,7 +1981,7 @@
 }
 
 
-static void __devexit hamachi_remove_one (struct pci_dev *pdev)
+static void __exit hamachi_remove_one (struct pci_dev *pdev)
 {
 	struct net_device *dev = pci_get_drvdata(pdev);
 
@@ -2011,7 +2011,7 @@
 	name:		DRV_NAME,
 	id_table:	hamachi_pci_tbl,
 	probe:		hamachi_init_one,
-	remove:		__devexit_p(hamachi_remove_one),
+	remove:		hamachi_remove_one,
 };
 
 static int __init hamachi_init (void)
diff -urN linux-2.4.17-rc2/drivers/net/pcmcia/fmvj18x_cs.c linux-2.4.17-rc2-devexit-fix/drivers/net/pcmcia/fmvj18x_cs.c
--- linux-2.4.17-rc2/drivers/net/pcmcia/fmvj18x_cs.c	Wed Dec 19 12:58:08 2001
+++ linux-2.4.17-rc2-devexit-fix/drivers/net/pcmcia/fmvj18x_cs.c	Wed Dec 19 18:56:03 2001
@@ -1247,4 +1247,3 @@
     }
     restore_flags(flags);
 }
-MODULE_LICENSE("GPL");
diff -urN linux-2.4.17-rc2/drivers/net/tokenring/abyss.c linux-2.4.17-rc2-devexit-fix/drivers/net/tokenring/abyss.c
--- linux-2.4.17-rc2/drivers/net/tokenring/abyss.c	Wed Dec 19 12:58:08 2001
+++ linux-2.4.17-rc2-devexit-fix/drivers/net/tokenring/abyss.c	Wed Dec 19 18:56:03 2001
@@ -433,7 +433,7 @@
 	return 0;
 }
 
-static void __devexit abyss_detach (struct pci_dev *pdev)
+static void __exit abyss_detach (struct pci_dev *pdev)
 {
 	struct net_device *dev = pci_get_drvdata(pdev);
 	
@@ -451,7 +451,7 @@
 	name:		"abyss",
 	id_table:	abyss_pci_tbl,
 	probe:		abyss_attach,
-	remove:		__devexit_p(abyss_detach),
+	remove:		abyss_detach,
 };
 
 static int __init abyss_init (void)
diff -urN linux-2.4.17-rc2/drivers/net/tokenring/tmspci.c linux-2.4.17-rc2-devexit-fix/drivers/net/tokenring/tmspci.c
--- linux-2.4.17-rc2/drivers/net/tokenring/tmspci.c	Wed Dec 19 12:58:09 2001
+++ linux-2.4.17-rc2-devexit-fix/drivers/net/tokenring/tmspci.c	Wed Dec 19 18:56:03 2001
@@ -220,7 +220,7 @@
 	return val;
 }
 
-static void __devexit tms_pci_detach (struct pci_dev *pdev)
+static void __exit tms_pci_detach (struct pci_dev *pdev)
 {
 	struct net_device *dev = pci_get_drvdata(pdev);
 
@@ -238,7 +238,7 @@
 	name:		"tmspci",
 	id_table:	tmspci_pci_tbl,
 	probe:		tms_pci_attach,
-	remove:		__devexit_p(tms_pci_detach),
+	remove:		tms_pci_detach,
 };
 
 static int __init tms_pci_init (void)
diff -urN linux-2.4.17-rc2/drivers/net/wan/dscc4.c linux-2.4.17-rc2-devexit-fix/drivers/net/wan/dscc4.c
--- linux-2.4.17-rc2/drivers/net/wan/dscc4.c	Wed Dec 19 12:58:09 2001
+++ linux-2.4.17-rc2-devexit-fix/drivers/net/wan/dscc4.c	Wed Dec 19 18:56:03 2001
@@ -1634,7 +1634,7 @@
 	return &priv->stats;
 }
 
-static void __devexit dscc4_remove_one(struct pci_dev *pdev)
+static void __exit dscc4_remove_one(struct pci_dev *pdev)
 {
 	struct dscc4_pci_priv *ppriv;
 	struct net_device *root;
@@ -1752,7 +1752,7 @@
 	name:           "dscc4",
 	id_table:       dscc4_pci_tbl,
 	probe:          dscc4_init_one,
-	remove:         __devexit_p(dscc4_remove_one),
+	remove:         dscc4_remove_one,
 };
 
 static int __init dscc4_init_module(void)