diff --git a/[refs] b/[refs] index 6287a9f14533..b324105512ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb9248eee600092dcd982ce12b964c90e30c075c +refs/heads/master: a027cb88bf692b86948c5495650665a2a1d5535f diff --git a/trunk/drivers/net/wireless/iwlegacy/3945-mac.c b/trunk/drivers/net/wireless/iwlegacy/3945-mac.c index e252acb9c862..d604b4036a76 100644 --- a/trunk/drivers/net/wireless/iwlegacy/3945-mac.c +++ b/trunk/drivers/net/wireless/iwlegacy/3945-mac.c @@ -3794,7 +3794,7 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) return err; } -static void __devexit +static void il3945_pci_remove(struct pci_dev *pdev) { struct il_priv *il = pci_get_drvdata(pdev); @@ -3884,7 +3884,7 @@ static struct pci_driver il3945_driver = { .name = DRV_NAME, .id_table = il3945_hw_card_ids, .probe = il3945_pci_probe, - .remove = __devexit_p(il3945_pci_remove), + .remove = il3945_pci_remove, .driver.pm = IL_LEGACY_PM_OPS, }; diff --git a/trunk/drivers/net/wireless/iwlegacy/4965-mac.c b/trunk/drivers/net/wireless/iwlegacy/4965-mac.c index 07ffa575e3ef..c3fbf6717564 100644 --- a/trunk/drivers/net/wireless/iwlegacy/4965-mac.c +++ b/trunk/drivers/net/wireless/iwlegacy/4965-mac.c @@ -6664,7 +6664,7 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) return err; } -static void __devexit +static void il4965_pci_remove(struct pci_dev *pdev) { struct il_priv *il = pci_get_drvdata(pdev); @@ -6772,7 +6772,7 @@ static struct pci_driver il4965_driver = { .name = DRV_NAME, .id_table = il4965_hw_card_ids, .probe = il4965_pci_probe, - .remove = __devexit_p(il4965_pci_remove), + .remove = il4965_pci_remove, .driver.pm = IL_LEGACY_PM_OPS, };