From c2fad149d08eb068b153a3332164adca83123e21 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:22:16 -0500
Subject: [PATCH] --- yaml --- r: 338143 b: refs/heads/master c:
 ffba1bc963ca5efe05836232bcf2d44916f0e3e9 h: refs/heads/master i:   338141:
 cb4b91af04f9aa6b2f5f16bc94a41fd5edc0da85   338139:
 f08fdd68728fa8119d2fe3bacb1ab485cb5f869d   338135:
 3bb4255dd430d71aa0b0faf7bbdf359459f7378d   338127:
 9c235cdd3e62fff7a2407e8dff9089a16f307817   338111:
 a13cce91842f28025d7f2513d8be52fe62969335 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 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;