diff -ur -x *.o -x *.flags /linux.vanilla/drivers/net/tokenring/tmspci.c /linux/drivers/net/tokenring/tmspci.c --- /linux.vanilla/drivers/net/tokenring/tmspci.c Mon Apr 2 15:45:22 2001 +++ /linux/drivers/net/tokenring/tmspci.c Sat Apr 7 22:04:33 2001 @@ -90,7 +90,7 @@ outw(val, dev->base_addr + reg); } -static int __init tms_pci_attach(struct pci_dev *pdev, const struct pci_device_id *ent) +static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_device_id *ent) { static int versionprinted; struct net_device *dev; @@ -192,7 +192,7 @@ * machine hard when this is called. Luckily, its supported in a * seperate driver. --ASF */ -static void tms_pci_read_eeprom(struct net_device *dev) +static void __devinit tms_pci_read_eeprom(struct net_device *dev) { int i; @@ -219,7 +219,7 @@ return val; } -static void __exit tms_pci_detach (struct pci_dev *pdev) +static void __devexit tms_pci_detach (struct pci_dev *pdev) { struct net_device *dev = pci_get_drvdata(pdev);