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);