From b31c3e6f14388fb79bb3d0d1f73a7998ac76550a Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:22:17 -0500
Subject: [PATCH] --- yaml --- r: 338144 b: refs/heads/master c:
 2a91a6d1422f6dc3cb27689e18e16b8c98ec1c73 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1208a88112de..3ea2ea536953 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffba1bc963ca5efe05836232bcf2d44916f0e3e9
+refs/heads/master: 2a91a6d1422f6dc3cb27689e18e16b8c98ec1c73
diff --git a/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c b/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c
index 15f7468a2475..c8af551626fb 100644
--- a/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c
+++ b/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c
@@ -718,7 +718,7 @@ static const struct v4l2_ioctl_ops dt3155_ioctl_ops = {
 */
 };
 
-static int __devinit
+static int
 dt3155_init_board(struct pci_dev *pdev)
 {
 	struct dt3155_priv *pd = pci_get_drvdata(pdev);
@@ -836,7 +836,7 @@ struct dma_coherent_mem {
 	unsigned long	*bitmap;
 };
 
-static int __devinit
+static int
 dt3155_alloc_coherent(struct device *dev, size_t size, int flags)
 {
 	struct dma_coherent_mem *mem;
@@ -891,7 +891,7 @@ dt3155_free_coherent(struct device *dev)
 	kfree(mem);
 }
 
-static int __devinit
+static int
 dt3155_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
 	int err;