From 71c14a15a309cf631387ee1803811d90af345350 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 3 Dec 2012 09:23:00 -0500 Subject: [PATCH] --- yaml --- r: 341763 b: refs/heads/master c: c4eef189aaef84612de3961b2681fbf794afca20 h: refs/heads/master i: 341761: 34aca9ef652e8e14cdee51ce23ad019a571be5a9 341759: bbd7c7545df1a1a53a7c9e1bc8eaebb034559ca5 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/brocade/bna/bnad.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 857229b21e6c..352e0228b539 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 229b1ad1cb1a7159658f466c736bc3898dabb876 +refs/heads/master: c4eef189aaef84612de3961b2681fbf794afca20 diff --git a/trunk/drivers/net/ethernet/brocade/bna/bnad.c b/trunk/drivers/net/ethernet/brocade/bna/bnad.c index ce1eac529470..76b2af64adc2 100644 --- a/trunk/drivers/net/ethernet/brocade/bna/bnad.c +++ b/trunk/drivers/net/ethernet/brocade/bna/bnad.c @@ -3226,7 +3226,7 @@ bnad_pci_uninit(struct pci_dev *pdev) pci_disable_device(pdev); } -static int __devinit +static int bnad_pci_probe(struct pci_dev *pdev, const struct pci_device_id *pcidev_id) { @@ -3426,7 +3426,7 @@ bnad_pci_probe(struct pci_dev *pdev, return err; } -static void __devexit +static void bnad_pci_remove(struct pci_dev *pdev) { struct net_device *netdev = pci_get_drvdata(pdev); @@ -3490,7 +3490,7 @@ static struct pci_driver bnad_pci_driver = { .name = BNAD_NAME, .id_table = bnad_pci_id_table, .probe = bnad_pci_probe, - .remove = __devexit_p(bnad_pci_remove), + .remove = bnad_pci_remove, }; static int __init