diff -ur -x *.o -x *.flags /linux.vanilla/drivers/net/hamachi.c /linux/drivers/net/hamachi.c
--- /linux.vanilla/drivers/net/hamachi.c	Mon Apr  2 15:45:33 2001
+++ /linux/drivers/net/hamachi.c	Sun Apr  8 23:48:24 2001
@@ -545,7 +544,7 @@
 static void set_rx_mode(struct net_device *dev);
 
 
-static int __init hamachi_init_one (struct pci_dev *pdev,
+static int __devinit hamachi_init_one (struct pci_dev *pdev,
 				    const struct pci_device_id *ent)
 {
 	static int did_version = 0;			/* Already printed version info. */
@@ -728,7 +727,7 @@
 	return 0;
 }
 
-static int read_eeprom(long ioaddr, int location)
+static int __devinit read_eeprom(long ioaddr, int location)
 {
 	int bogus_cnt = 1000;
 
@@ -1858,7 +1857,7 @@
 }
 
 
-static void __exit hamachi_remove_one (struct pci_dev *pdev)
+static void __devexit hamachi_remove_one (struct pci_dev *pdev)
 {
 	struct net_device *dev = pci_get_drvdata(pdev);