3 @@ -2002,7 +2002,7 @@ int acx100mem_ioctl_set_phy_amp_bias(str
5 * id - ptr to the device id entry that matched this device
7 -static int __devinit acxmem_probe(struct platform_device *pdev)
8 +static int acxmem_probe(struct platform_device *pdev)
10 acx_device_t *adev = NULL;
11 const char *chip_name;
12 @@ -2268,7 +2268,7 @@ done:
13 * pdev - ptr to PCI device structure containing info about pci
16 -static int __devexit acxmem_remove(struct platform_device *pdev)
17 +static int acxmem_remove(struct platform_device *pdev)
19 struct ieee80211_hw *hw = (struct ieee80211_hw *)
20 platform_get_drvdata(pdev);
21 @@ -2470,7 +2470,7 @@ static struct platform_driver acxmem_dri
24 .probe = acxmem_probe,
25 - .remove = __devexit_p(acxmem_remove),
26 + .remove = acxmem_remove,
29 .suspend = acxmem_e_suspend,
32 @@ -982,7 +982,7 @@ int acx100pci_ioctl_set_phy_amp_bias(str
33 * id - ptr to the device id entry that matched this device
36 -static int __devinit acxpci_probe(struct pci_dev *pdev,
37 +static int acxpci_probe(struct pci_dev *pdev,
38 const struct pci_device_id *id)
40 acx111_ie_configoption_t co;
41 @@ -1346,7 +1346,7 @@ done:
43 * pdev - ptr to PCI device structure containing info about pci configuration
45 -static void __devexit acxpci_remove(struct pci_dev *pdev)
46 +static void acxpci_remove(struct pci_dev *pdev)
48 struct ieee80211_hw *hw
49 = (struct ieee80211_hw *) pci_get_drvdata(pdev);
50 @@ -1537,7 +1537,7 @@ static int acxpci_e_resume(struct pci_de
54 -static struct acxpci_device_info acxpci_info_tbl[] __devinitdata = {
55 +static struct acxpci_device_info acxpci_info_tbl[] = {
57 .part_name = "acx111",
58 .helper_image = "tiacx1111r16", // probly wrong !!
59 @@ -1564,7 +1564,7 @@ static struct pci_driver acxpci_driver =
61 .id_table = acxpci_id_tbl,
62 .probe = acxpci_probe,
63 - .remove = __devexit_p(acxpci_remove),
64 + .remove = acxpci_remove,
66 .suspend = acxpci_e_suspend,
67 .resume = acxpci_e_resume
68 @@ -1662,7 +1662,7 @@ static struct vlynq_device_id acx_vlynq_
72 -static __devinit int vlynq_probe(struct vlynq_device *vdev,
73 +static int vlynq_probe(struct vlynq_device *vdev,
74 struct vlynq_device_id *id)
77 @@ -1971,7 +1971,7 @@ static struct vlynq_driver vlynq_acx = {
79 .id_table = acx_vlynq_id,
81 - .remove = __devexit_p(vlynq_remove),
82 + .remove = vlynq_remove,
84 #endif /* CONFIG_VLYNQ */