From 9d5910f0edcd3a4885b2b351248a37307ba5dbe1 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:26:52 -0500
Subject: [PATCH] --- yaml --- r: 338132 b: refs/heads/master c:
 f21a8247641329c40ab17b2d70c492c060bb3573 h: refs/heads/master v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/staging/vme/devices/vme_pio2_core.c | 4 ++--
 trunk/drivers/staging/vme/devices/vme_user.c      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8c05fbb3ce64..9fe7d5c1ae47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37a6520057c98d725be716497ba93b7380c9934f
+refs/heads/master: f21a8247641329c40ab17b2d70c492c060bb3573
diff --git a/trunk/drivers/staging/vme/devices/vme_pio2_core.c b/trunk/drivers/staging/vme/devices/vme_pio2_core.c
index 35880a3353fd..0331178ca3b3 100644
--- a/trunk/drivers/staging/vme/devices/vme_pio2_core.c
+++ b/trunk/drivers/staging/vme/devices/vme_pio2_core.c
@@ -43,7 +43,7 @@ static bool loopback;
 
 static int pio2_match(struct vme_dev *);
 static int pio2_probe(struct vme_dev *);
-static int __devexit pio2_remove(struct vme_dev *);
+static int pio2_remove(struct vme_dev *);
 
 static int pio2_get_led(struct pio2_card *card)
 {
@@ -455,7 +455,7 @@ static int pio2_probe(struct vme_dev *vdev)
 	return retval;
 }
 
-static int __devexit pio2_remove(struct vme_dev *vdev)
+static int pio2_remove(struct vme_dev *vdev)
 {
 	int vec;
 	int i;
diff --git a/trunk/drivers/staging/vme/devices/vme_user.c b/trunk/drivers/staging/vme/devices/vme_user.c
index e36211056272..4ef852c4c4e1 100644
--- a/trunk/drivers/staging/vme/devices/vme_user.c
+++ b/trunk/drivers/staging/vme/devices/vme_user.c
@@ -138,7 +138,7 @@ static long vme_user_unlocked_ioctl(struct file *, unsigned int, unsigned long);
 
 static int vme_user_match(struct vme_dev *);
 static int vme_user_probe(struct vme_dev *);
-static int __devexit vme_user_remove(struct vme_dev *);
+static int vme_user_remove(struct vme_dev *);
 
 static const struct file_operations vme_user_fops = {
 	.open = vme_user_open,
@@ -846,7 +846,7 @@ static int vme_user_probe(struct vme_dev *vdev)
 	return err;
 }
 
-static int __devexit vme_user_remove(struct vme_dev *dev)
+static int vme_user_remove(struct vme_dev *dev)
 {
 	int i;