diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-12-07 13:03:50 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-12-07 13:03:50 -0500 |
| commit | 8024dc191025d6b981563236df02da5c0db0854d (patch) | |
| tree | f42cd84995c804c3590c56616527f5399155060b /drivers/net/wireless/atmel_pci.c | |
| parent | fd3065b25b69ce345073bbd294a73343a608fd8b (diff) | |
| parent | 9e2ff36beae4bedbad2a69d458f9404f35fcb528 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/atmel_pci.c')
| -rw-r--r-- | drivers/net/wireless/atmel_pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/atmel_pci.c b/drivers/net/wireless/atmel_pci.c index 51e33b53386e..c1b159ebcffe 100644 --- a/drivers/net/wireless/atmel_pci.c +++ b/drivers/net/wireless/atmel_pci.c @@ -45,11 +45,11 @@ static struct pci_driver atmel_driver = { .name = "atmel", .id_table = card_ids, .probe = atmel_pci_probe, - .remove = __devexit_p(atmel_pci_remove), + .remove = atmel_pci_remove, }; -static int __devinit atmel_pci_probe(struct pci_dev *pdev, +static int atmel_pci_probe(struct pci_dev *pdev, const struct pci_device_id *pent) { struct net_device *dev; @@ -69,7 +69,7 @@ static int __devinit atmel_pci_probe(struct pci_dev *pdev, return 0; } -static void __devexit atmel_pci_remove(struct pci_dev *pdev) +static void atmel_pci_remove(struct pci_dev *pdev) { stop_atmel_card(pci_get_drvdata(pdev)); } |