diff --git a/[refs] b/[refs]
index 2241fd0d2318..1208a88112de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd8413a2b8328801133e95b58d751bfe48b34303
+refs/heads/master: ffba1bc963ca5efe05836232bcf2d44916f0e3e9
diff --git a/trunk/drivers/staging/media/solo6x10/core.c b/trunk/drivers/staging/media/solo6x10/core.c
index 3ee9b125797f..c0319e6a3806 100644
--- a/trunk/drivers/staging/media/solo6x10/core.c
+++ b/trunk/drivers/staging/media/solo6x10/core.c
@@ -129,7 +129,7 @@ static void free_solo_dev(struct solo_dev *solo_dev)
 	kfree(solo_dev);
 }
 
-static int __devinit solo_pci_probe(struct pci_dev *pdev,
+static int solo_pci_probe(struct pci_dev *pdev,
 				    const struct pci_device_id *id)
 {
 	struct solo_dev *solo_dev;