From 1d4986550f4a163e5eb25ace88e9a04eca369667 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 3 Dec 2012 09:23:53 -0500
Subject: [PATCH] --- yaml --- r: 341816 b: refs/heads/master c:
 af37557b1b222c64e005c105c81aa3888128bb5d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 92aa0b605f83..98847d0768e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 331774760a65c27c673aa7735075124978e7994b
+refs/heads/master: af37557b1b222c64e005c105c81aa3888128bb5d
diff --git a/trunk/drivers/net/ethernet/jme.c b/trunk/drivers/net/ethernet/jme.c
index 60ac46f4ac08..0519afa413d2 100644
--- a/trunk/drivers/net/ethernet/jme.c
+++ b/trunk/drivers/net/ethernet/jme.c
@@ -2965,7 +2965,7 @@ static const struct net_device_ops jme_netdev_ops = {
 #endif
 };
 
-static int __devinit
+static int
 jme_init_one(struct pci_dev *pdev,
 	     const struct pci_device_id *ent)
 {
@@ -3203,7 +3203,7 @@ jme_init_one(struct pci_dev *pdev,
 	return rc;
 }
 
-static void __devexit
+static void
 jme_remove_one(struct pci_dev *pdev)
 {
 	struct net_device *netdev = pci_get_drvdata(pdev);
@@ -3318,7 +3318,7 @@ static struct pci_driver jme_driver = {
 	.name           = DRV_NAME,
 	.id_table       = jme_pci_tbl,
 	.probe          = jme_init_one,
-	.remove         = __devexit_p(jme_remove_one),
+	.remove         = jme_remove_one,
 	.shutdown       = jme_shutdown,
 	.driver.pm	= JME_PM_OPS,
 };