From d9bfbec7582ae676086b84f6ffc837a9b8adac3e Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:27:11 -0500
Subject: [PATCH] --- yaml --- r: 338146 b: refs/heads/master c:
 4ce7986ddb6c515edeb41eebef9bd08f90772d67 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8c6fa2047641..27714a6b505d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dd1119528d68e6f3a04874792048fc7be7611d7
+refs/heads/master: 4ce7986ddb6c515edeb41eebef9bd08f90772d67
diff --git a/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c b/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c
index c8af551626fb..238910373f5c 100644
--- a/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c
+++ b/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c
@@ -877,7 +877,7 @@ dt3155_alloc_coherent(struct device *dev, size_t size, int flags)
 	return 0;
 }
 
-static void __devexit
+static void
 dt3155_free_coherent(struct device *dev)
 {
 	struct dma_coherent_mem *mem = dev->dma_mem;
@@ -956,7 +956,7 @@ dt3155_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	return err;
 }
 
-static void __devexit
+static void
 dt3155_remove(struct pci_dev *pdev)
 {
 	struct dt3155_priv *pd = pci_get_drvdata(pdev);