From 89e2feaa9cc3a1469d8532de357ae41c20d1d50c Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 6 Feb 2013 14:03:13 +1100
Subject: [PATCH] --- yaml --- r: 359534 b: refs/heads/master c:
 82bed4d5f8189a2f9db5d1bb6489ac2615426d65 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/block/rsxx/core.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 6b002af790f0..ee177504e239 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8722ff8cdbfac9c1b20e67bb067b455c48cb8e93
+refs/heads/master: 82bed4d5f8189a2f9db5d1bb6489ac2615426d65
diff --git a/trunk/drivers/block/rsxx/core.c b/trunk/drivers/block/rsxx/core.c
index f75219140e70..83dadbee0375 100644
--- a/trunk/drivers/block/rsxx/core.c
+++ b/trunk/drivers/block/rsxx/core.c
@@ -319,7 +319,7 @@ static int rsxx_compatibility_check(struct rsxx_cardinfo *card)
 	return 0;
 }
 
-static int __devinit rsxx_pci_probe(struct pci_dev *dev,
+static int rsxx_pci_probe(struct pci_dev *dev,
 					const struct pci_device_id *id)
 {
 	struct rsxx_cardinfo *card;
@@ -510,7 +510,7 @@ static int __devinit rsxx_pci_probe(struct pci_dev *dev,
 	return st;
 }
 
-static void __devexit rsxx_pci_remove(struct pci_dev *dev)
+static void rsxx_pci_remove(struct pci_dev *dev)
 {
 	struct rsxx_cardinfo *card = pci_get_drvdata(dev);
 	unsigned long flags;
@@ -608,7 +608,7 @@ static struct pci_driver rsxx_pci_driver = {
 	.name		= DRIVER_NAME,
 	.id_table	= rsxx_pci_ids,
 	.probe		= rsxx_pci_probe,
-	.remove		= __devexit_p(rsxx_pci_remove),
+	.remove		= rsxx_pci_remove,
 	.suspend	= rsxx_pci_suspend,
 	.shutdown	= rsxx_pci_shutdown,
 };