1 --- a/driver/include/linuxver.h
2 +++ b/driver/include/linuxver.h
3 @@ -139,22 +139,6 @@ typedef struct pcmcia_device dev_link_t;
5 #endif /* CONFIG_PCMCIA */
14 -#define __devinit __init
16 -#ifndef __devinitdata
17 -#define __devinitdata
20 -#define __devexit_p(x) x
23 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0))
25 #define pci_get_drvdata(dev) (dev)->sysdata
26 --- a/driver/wl_linux.c
27 +++ b/driver/wl_linux.c
28 @@ -854,7 +854,7 @@ wl_read_proc(char *buffer, char **start,
32 -static void __devexit wl_remove(struct pci_dev *pdev);
33 +static void wl_remove(struct pci_dev *pdev);
35 * determines if a device is a WL device, and if so, attaches it.
37 @@ -862,7 +862,7 @@ static void __devexit wl_remove(struct p
38 * and if so, performs a wl_attach() on it.
43 wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
46 @@ -976,7 +976,7 @@ wl_resume(struct pci_dev *pdev)
48 #endif /* LINUXSTA_PS */
50 -static void __devexit
52 wl_remove(struct pci_dev *pdev)
54 wl_info_t *wl = (wl_info_t *) pci_get_drvdata(pdev);
55 @@ -1007,7 +1007,7 @@ static struct pci_driver wl_pci_driver =
58 #endif /* LINUXSTA_PS */
59 - remove: __devexit_p(wl_remove),
61 id_table: wl_id_table,
63 #endif /* CONFIG_PCI */
64 --- a/driver/wl_linux.h
65 +++ b/driver/wl_linux.h
66 @@ -33,7 +33,7 @@ extern irqreturn_t wl_isr(int irq, void
67 extern irqreturn_t wl_isr(int irq, void *dev_id, struct pt_regs *ptregs);
70 -extern int __devinit wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
71 +extern int wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
72 extern void wl_free(wl_info_t *wl);
73 extern int wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
74 extern struct net_device * wl_netdev_get(wl_info_t *wl);