From 8b03db9b4d3a5671825361dddedb2d3aa70cf373 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:21:14 -0500
Subject: [PATCH] --- yaml --- r: 336983 b: refs/heads/master c:
 f91a66c97b38a504827803bb93f83a7b85e50e5a h: refs/heads/master i:   336981:
 fc2833b8cf2c366cf06a386140efbcba79fd24fa   336979:
 040e1cd1536fde011ca61a93e5c9b025ac49c45f   336975:
 760d0cc4ab9341be7cbc28d3f76293666820e607 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/w1/masters/matrox_w1.c | 2 +-
 trunk/drivers/w1/masters/omap_hdq.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 48e21394c66b..84daaa0a5e94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 128485daadc53ff0570132c0c3ed70a6f0610bf6
+refs/heads/master: f91a66c97b38a504827803bb93f83a7b85e50e5a
diff --git a/trunk/drivers/w1/masters/matrox_w1.c b/trunk/drivers/w1/masters/matrox_w1.c
index f667c26b2195..0a3c423a0c9d 100644
--- a/trunk/drivers/w1/masters/matrox_w1.c
+++ b/trunk/drivers/w1/masters/matrox_w1.c
@@ -55,7 +55,7 @@ static struct pci_driver matrox_w1_pci_driver = {
 	.name = "matrox_w1",
 	.id_table = matrox_w1_tbl,
 	.probe = matrox_w1_probe,
-	.remove = __devexit_p(matrox_w1_remove),
+	.remove = matrox_w1_remove,
 };
 
 /*
diff --git a/trunk/drivers/w1/masters/omap_hdq.c b/trunk/drivers/w1/masters/omap_hdq.c
index ca8e60bb2f9c..652ca7f207e3 100644
--- a/trunk/drivers/w1/masters/omap_hdq.c
+++ b/trunk/drivers/w1/masters/omap_hdq.c
@@ -74,7 +74,7 @@ static int __devexit omap_hdq_remove(struct platform_device *pdev);
 
 static struct platform_driver omap_hdq_driver = {
 	.probe =	omap_hdq_probe,
-	.remove =	__devexit_p(omap_hdq_remove),
+	.remove =	omap_hdq_remove,
 	.driver =	{
 		.name =	"omap_hdq",
 	},