diff -urpN -X /home/fletch/.diff.exclude 670-warn_tulip/drivers/net/e1000/e1000_main.c 671-warn_e1000/drivers/net/e1000/e1000_main.c
--- 670-warn_tulip/drivers/net/e1000/e1000_main.c	Sat May 10 18:48:32 2003
+++ 671-warn_e1000/drivers/net/e1000/e1000_main.c	Sat May 10 19:44:06 2003
@@ -130,7 +130,7 @@ int e1000_set_spd_dplx(struct e1000_adap
 static int e1000_init_module(void);
 static void e1000_exit_module(void);
 static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
-static void e1000_remove(struct pci_dev *pdev);
+static void __devexit e1000_remove(struct pci_dev *pdev);
 static int e1000_sw_init(struct e1000_adapter *adapter);
 static int e1000_open(struct net_device *netdev);
 static int e1000_close(struct net_device *netdev);