From db03a8829de7148aed1c5170a74d2f85f85d52c2 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:27:12 -0500
Subject: [PATCH] --- yaml --- r: 338147 b: refs/heads/master c:
 1c979395cada4016a7532e6b4b7c63fc5dcb0745 h: refs/heads/master i:   338145:
 603b65afcf932fe2e719a3fa7e4b1f0683b033f0   338143:
 c2fad149d08eb068b153a3332164adca83123e21 v: v3

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

diff --git a/[refs] b/[refs]
index 27714a6b505d..f3505d769bdb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ce7986ddb6c515edeb41eebef9bd08f90772d67
+refs/heads/master: 1c979395cada4016a7532e6b4b7c63fc5dcb0745
diff --git a/trunk/drivers/staging/media/solo6x10/core.c b/trunk/drivers/staging/media/solo6x10/core.c
index c0319e6a3806..fd83d6d028bf 100644
--- a/trunk/drivers/staging/media/solo6x10/core.c
+++ b/trunk/drivers/staging/media/solo6x10/core.c
@@ -284,7 +284,7 @@ static int solo_pci_probe(struct pci_dev *pdev,
 	return ret;
 }
 
-static void __devexit solo_pci_remove(struct pci_dev *pdev)
+static void solo_pci_remove(struct pci_dev *pdev)
 {
 	struct solo_dev *solo_dev = pci_get_drvdata(pdev);