From 07d3b32262983cda235e9ccc40172f9e3af85c14 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:26:48 -0500
Subject: [PATCH] --- yaml --- r: 338128 b: refs/heads/master c:
 ecb4f3879d197ed8c248592acfc2741280d20045 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/slicoss/slicoss.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3a829574303f..2783f07666e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a46303ca3bbbbe153630bc4882f83c38c949d171
+refs/heads/master: ecb4f3879d197ed8c248592acfc2741280d20045
diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c
index 30def84cea22..78578ee59557 100644
--- a/trunk/drivers/staging/slicoss/slicoss.c
+++ b/trunk/drivers/staging/slicoss/slicoss.c
@@ -3046,7 +3046,7 @@ static void slic_card_cleanup(struct sliccard *card)
 	kfree(card);
 }
 
-static void __devexit slic_entry_remove(struct pci_dev *pcidev)
+static void slic_entry_remove(struct pci_dev *pcidev)
 {
 	struct net_device *dev = pci_get_drvdata(pcidev);
 	u32 mmio_start = 0;