diff options
-rw-r--r-- | drivers/net/wireless/adm8211.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/airo.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c index 154a4965be4f..3d339e04efb7 100644 --- a/drivers/net/wireless/adm8211.c +++ b/drivers/net/wireless/adm8211.c | |||
@@ -1761,7 +1761,7 @@ static const struct ieee80211_ops adm8211_ops = { | |||
1761 | .get_tsf = adm8211_get_tsft | 1761 | .get_tsf = adm8211_get_tsft |
1762 | }; | 1762 | }; |
1763 | 1763 | ||
1764 | static int __devinit adm8211_probe(struct pci_dev *pdev, | 1764 | static int adm8211_probe(struct pci_dev *pdev, |
1765 | const struct pci_device_id *id) | 1765 | const struct pci_device_id *id) |
1766 | { | 1766 | { |
1767 | struct ieee80211_hw *dev; | 1767 | struct ieee80211_hw *dev; |
@@ -1935,7 +1935,7 @@ static int __devinit adm8211_probe(struct pci_dev *pdev, | |||
1935 | } | 1935 | } |
1936 | 1936 | ||
1937 | 1937 | ||
1938 | static void __devexit adm8211_remove(struct pci_dev *pdev) | 1938 | static void adm8211_remove(struct pci_dev *pdev) |
1939 | { | 1939 | { |
1940 | struct ieee80211_hw *dev = pci_get_drvdata(pdev); | 1940 | struct ieee80211_hw *dev = pci_get_drvdata(pdev); |
1941 | struct adm8211_priv *priv; | 1941 | struct adm8211_priv *priv; |
@@ -1985,7 +1985,7 @@ static struct pci_driver adm8211_driver = { | |||
1985 | .name = "adm8211", | 1985 | .name = "adm8211", |
1986 | .id_table = adm8211_pci_id_table, | 1986 | .id_table = adm8211_pci_id_table, |
1987 | .probe = adm8211_probe, | 1987 | .probe = adm8211_probe, |
1988 | .remove = __devexit_p(adm8211_remove), | 1988 | .remove = adm8211_remove, |
1989 | #ifdef CONFIG_PM | 1989 | #ifdef CONFIG_PM |
1990 | .suspend = adm8211_suspend, | 1990 | .suspend = adm8211_suspend, |
1991 | .resume = adm8211_resume, | 1991 | .resume = adm8211_resume, |
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 57f7db1ac31b..53295418f576 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
@@ -78,7 +78,7 @@ static struct pci_driver airo_driver = { | |||
78 | .name = DRV_NAME, | 78 | .name = DRV_NAME, |
79 | .id_table = card_ids, | 79 | .id_table = card_ids, |
80 | .probe = airo_pci_probe, | 80 | .probe = airo_pci_probe, |
81 | .remove = __devexit_p(airo_pci_remove), | 81 | .remove = airo_pci_remove, |
82 | .suspend = airo_pci_suspend, | 82 | .suspend = airo_pci_suspend, |
83 | .resume = airo_pci_resume, | 83 | .resume = airo_pci_resume, |
84 | }; | 84 | }; |
@@ -5584,7 +5584,7 @@ static void timer_func( struct net_device *dev ) { | |||
5584 | } | 5584 | } |
5585 | 5585 | ||
5586 | #ifdef CONFIG_PCI | 5586 | #ifdef CONFIG_PCI |
5587 | static int __devinit airo_pci_probe(struct pci_dev *pdev, | 5587 | static int airo_pci_probe(struct pci_dev *pdev, |
5588 | const struct pci_device_id *pent) | 5588 | const struct pci_device_id *pent) |
5589 | { | 5589 | { |
5590 | struct net_device *dev; | 5590 | struct net_device *dev; |
@@ -5606,7 +5606,7 @@ static int __devinit airo_pci_probe(struct pci_dev *pdev, | |||
5606 | return 0; | 5606 | return 0; |
5607 | } | 5607 | } |
5608 | 5608 | ||
5609 | static void __devexit airo_pci_remove(struct pci_dev *pdev) | 5609 | static void airo_pci_remove(struct pci_dev *pdev) |
5610 | { | 5610 | { |
5611 | struct net_device *dev = pci_get_drvdata(pdev); | 5611 | struct net_device *dev = pci_get_drvdata(pdev); |
5612 | 5612 | ||