From debb51953bfab9eae0e7a8e4d4f56def334138b2 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 3 Dec 2012 09:23:26 -0500
Subject: [PATCH] --- yaml --- r: 341789 b: refs/heads/master c:
 e3a582feac18f586d1ba9ddb08d4f77719923bc9 h: refs/heads/master i:   341787:
 185becd3e2fb5b10cf3b02c8c0bba161762a2f79 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/ethernet/qlogic/qla3xxx.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1e34ca368407..05c068e031fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bb58bb0afa28bc573fb8240a4bc4e04890e3389
+refs/heads/master: e3a582feac18f586d1ba9ddb08d4f77719923bc9
diff --git a/trunk/drivers/net/ethernet/qlogic/qla3xxx.c b/trunk/drivers/net/ethernet/qlogic/qla3xxx.c
index 12d1f2470d5c..df6eb27fa101 100644
--- a/trunk/drivers/net/ethernet/qlogic/qla3xxx.c
+++ b/trunk/drivers/net/ethernet/qlogic/qla3xxx.c
@@ -3769,7 +3769,7 @@ static const struct net_device_ops ql3xxx_netdev_ops = {
 	.ndo_tx_timeout		= ql3xxx_tx_timeout,
 };
 
-static int __devinit ql3xxx_probe(struct pci_dev *pdev,
+static int ql3xxx_probe(struct pci_dev *pdev,
 				  const struct pci_device_id *pci_entry)
 {
 	struct net_device *ndev = NULL;
@@ -3925,7 +3925,7 @@ static int __devinit ql3xxx_probe(struct pci_dev *pdev,
 	return err;
 }
 
-static void __devexit ql3xxx_remove(struct pci_dev *pdev)
+static void ql3xxx_remove(struct pci_dev *pdev)
 {
 	struct net_device *ndev = pci_get_drvdata(pdev);
 	struct ql3_adapter *qdev = netdev_priv(ndev);
@@ -3952,7 +3952,7 @@ static struct pci_driver ql3xxx_driver = {
 	.name = DRV_NAME,
 	.id_table = ql3xxx_pci_tbl,
 	.probe = ql3xxx_probe,
-	.remove = __devexit_p(ql3xxx_remove),
+	.remove = ql3xxx_remove,
 };
 
 module_pci_driver(ql3xxx_driver);