From 71eaa04e735048b6ad65314ccb3f98c87dfdb07d Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:26:23 -0500
Subject: [PATCH] --- yaml --- r: 336985 b: refs/heads/master c:
 82849a93aad04c5a438d811081341b245fdade8c h: refs/heads/master i:   336983:
 8b03db9b4d3a5671825361dddedb2d3aa70cf373 v: v3

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

diff --git a/[refs] b/[refs]
index a347c22c7cb8..c654fe6bcacc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 479e2bcecdf19ae44940d38248a3e2f9fd8f2c44
+refs/heads/master: 82849a93aad04c5a438d811081341b245fdade8c
diff --git a/trunk/drivers/w1/masters/matrox_w1.c b/trunk/drivers/w1/masters/matrox_w1.c
index 1197f7ec54f2..d8667b0212d7 100644
--- a/trunk/drivers/w1/masters/matrox_w1.c
+++ b/trunk/drivers/w1/masters/matrox_w1.c
@@ -49,7 +49,7 @@ static struct pci_device_id matrox_w1_tbl[] = {
 MODULE_DEVICE_TABLE(pci, matrox_w1_tbl);
 
 static int matrox_w1_probe(struct pci_dev *, const struct pci_device_id *);
-static void __devexit matrox_w1_remove(struct pci_dev *);
+static void matrox_w1_remove(struct pci_dev *);
 
 static struct pci_driver matrox_w1_pci_driver = {
 	.name = "matrox_w1",
@@ -220,7 +220,7 @@ static int matrox_w1_probe(struct pci_dev *pdev, const struct pci_device_id *ent
 	return err;
 }
 
-static void __devexit matrox_w1_remove(struct pci_dev *pdev)
+static void matrox_w1_remove(struct pci_dev *pdev)
 {
 	struct matrox_device *dev = pci_get_drvdata(pdev);
 
diff --git a/trunk/drivers/w1/masters/mxc_w1.c b/trunk/drivers/w1/masters/mxc_w1.c
index 23d391757491..d338b56ea2f0 100644
--- a/trunk/drivers/w1/masters/mxc_w1.c
+++ b/trunk/drivers/w1/masters/mxc_w1.c
@@ -167,7 +167,7 @@ static int mxc_w1_probe(struct platform_device *pdev)
 /*
  * disassociate the w1 device from the driver
  */
-static int __devexit mxc_w1_remove(struct platform_device *pdev)
+static int mxc_w1_remove(struct platform_device *pdev)
 {
 	struct mxc_w1_device *mdev = platform_get_drvdata(pdev);
 	struct resource *res;
diff --git a/trunk/drivers/w1/masters/omap_hdq.c b/trunk/drivers/w1/masters/omap_hdq.c
index d3bdcc320eda..184dbce4abd1 100644
--- a/trunk/drivers/w1/masters/omap_hdq.c
+++ b/trunk/drivers/w1/masters/omap_hdq.c
@@ -70,7 +70,7 @@ struct hdq_data {
 };
 
 static int omap_hdq_probe(struct platform_device *pdev);
-static int __devexit omap_hdq_remove(struct platform_device *pdev);
+static int omap_hdq_remove(struct platform_device *pdev);
 
 static struct platform_driver omap_hdq_driver = {
 	.probe =	omap_hdq_probe,
@@ -613,7 +613,7 @@ static int omap_hdq_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int __devexit omap_hdq_remove(struct platform_device *pdev)
+static int omap_hdq_remove(struct platform_device *pdev)
 {
 	struct hdq_data *hdq_data = platform_get_drvdata(pdev);