From 2c117f8b9f5b9df88083488e359a9cdbe6a54529 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 3 Dec 2012 09:23:09 -0500 Subject: [PATCH] --- yaml --- r: 341772 b: refs/heads/master c: 3bc6b06ce06039b981333e600f79963ae5a86dba h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/emulex/benet/be_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5d5bb009202b..65b89b3fdc2a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f2c53ea27a8d12aaf07f61b5d13d20cadfdefd0 +refs/heads/master: 3bc6b06ce06039b981333e600f79963ae5a86dba diff --git a/trunk/drivers/net/ethernet/emulex/benet/be_main.c b/trunk/drivers/net/ethernet/emulex/benet/be_main.c index 0661e9379583..b003abc24227 100644 --- a/trunk/drivers/net/ethernet/emulex/benet/be_main.c +++ b/trunk/drivers/net/ethernet/emulex/benet/be_main.c @@ -3761,7 +3761,7 @@ static int be_stats_init(struct be_adapter *adapter) return 0; } -static void __devexit be_remove(struct pci_dev *pdev) +static void be_remove(struct pci_dev *pdev) { struct be_adapter *adapter = pci_get_drvdata(pdev); @@ -3994,7 +3994,7 @@ static inline char *func_name(struct be_adapter *adapter) return be_physfn(adapter) ? "PF" : "VF"; } -static int __devinit be_probe(struct pci_dev *pdev, +static int be_probe(struct pci_dev *pdev, const struct pci_device_id *pdev_id) { int status = 0;