From 705b796a77f876c41bc9d3fb22d2fb62b8efb150 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:21:49 -0500
Subject: [PATCH] --- yaml --- r: 337007 b: refs/heads/master c:
 b17b75bb524c6c0dfa5ee4a33591b8a7dcc034d2 h: refs/heads/master i:   337005:
 3e1db00e724534b8198dfc1cd5218bcd0c35d6c9   337003:
 26be04c829530739142f90f8911c6394c1cc22f2   336999:
 e829cd53215451739819f68b608b5c46d513fd4c   336991:
 0f9a0ac1768276c36682c160b33a97ffd36e2f46 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/uio/uio_aec.c         | 2 +-
 trunk/drivers/uio/uio_cif.c         | 2 +-
 trunk/drivers/uio/uio_netx.c        | 2 +-
 trunk/drivers/uio/uio_pci_generic.c | 2 +-
 trunk/drivers/uio/uio_pruss.c       | 2 +-
 trunk/drivers/uio/uio_sercos3.c     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index dc81e56b9395..4fab87fcb590 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a59509b4753c281d3003eb996c8137bef62e5a9
+refs/heads/master: b17b75bb524c6c0dfa5ee4a33591b8a7dcc034d2
diff --git a/trunk/drivers/uio/uio_aec.c b/trunk/drivers/uio/uio_aec.c
index 72b22d44e8b9..1548982db58b 100644
--- a/trunk/drivers/uio/uio_aec.c
+++ b/trunk/drivers/uio/uio_aec.c
@@ -78,7 +78,7 @@ static void print_board_data(struct pci_dev *pdev, struct uio_info *i)
 		ioread8(i->priv + 0x07));
 }
 
-static int __devinit probe(struct pci_dev *pdev, const struct pci_device_id *id)
+static int probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
 	struct uio_info *info;
 	int ret;
diff --git a/trunk/drivers/uio/uio_cif.c b/trunk/drivers/uio/uio_cif.c
index a84a451159ed..674783f785e8 100644
--- a/trunk/drivers/uio/uio_cif.c
+++ b/trunk/drivers/uio/uio_cif.c
@@ -40,7 +40,7 @@ static irqreturn_t hilscher_handler(int irq, struct uio_info *dev_info)
 	return IRQ_HANDLED;
 }
 
-static int __devinit hilscher_pci_probe(struct pci_dev *dev,
+static int hilscher_pci_probe(struct pci_dev *dev,
 					const struct pci_device_id *id)
 {
 	struct uio_info *info;
diff --git a/trunk/drivers/uio/uio_netx.c b/trunk/drivers/uio/uio_netx.c
index a879fd5741f8..6a4ba5e83e37 100644
--- a/trunk/drivers/uio/uio_netx.c
+++ b/trunk/drivers/uio/uio_netx.c
@@ -48,7 +48,7 @@ static irqreturn_t netx_handler(int irq, struct uio_info *dev_info)
 	return IRQ_HANDLED;
 }
 
-static int __devinit netx_pci_probe(struct pci_dev *dev,
+static int netx_pci_probe(struct pci_dev *dev,
 					const struct pci_device_id *id)
 {
 	struct uio_info *info;
diff --git a/trunk/drivers/uio/uio_pci_generic.c b/trunk/drivers/uio/uio_pci_generic.c
index 0bd08ef2b394..14aa10c1f6de 100644
--- a/trunk/drivers/uio/uio_pci_generic.c
+++ b/trunk/drivers/uio/uio_pci_generic.c
@@ -53,7 +53,7 @@ static irqreturn_t irqhandler(int irq, struct uio_info *info)
 	return IRQ_HANDLED;
 }
 
-static int __devinit probe(struct pci_dev *pdev,
+static int probe(struct pci_dev *pdev,
 			   const struct pci_device_id *id)
 {
 	struct uio_pci_generic_dev *gdev;
diff --git a/trunk/drivers/uio/uio_pruss.c b/trunk/drivers/uio/uio_pruss.c
index d877d643433c..098d3d008172 100644
--- a/trunk/drivers/uio/uio_pruss.c
+++ b/trunk/drivers/uio/uio_pruss.c
@@ -112,7 +112,7 @@ static void pruss_cleanup(struct platform_device *dev,
 	kfree(gdev);
 }
 
-static int __devinit pruss_probe(struct platform_device *dev)
+static int pruss_probe(struct platform_device *dev)
 {
 	struct uio_info *p;
 	struct uio_pruss_dev *gdev;
diff --git a/trunk/drivers/uio/uio_sercos3.c b/trunk/drivers/uio/uio_sercos3.c
index a187fa14c5c0..2e87808711cf 100644
--- a/trunk/drivers/uio/uio_sercos3.c
+++ b/trunk/drivers/uio/uio_sercos3.c
@@ -116,7 +116,7 @@ static int sercos3_setup_iomem(struct pci_dev *dev, struct uio_info *info,
 	return 0;
 }
 
-static int __devinit sercos3_pci_probe(struct pci_dev *dev,
+static int sercos3_pci_probe(struct pci_dev *dev,
 				       const struct pci_device_id *id)
 {
 	struct uio_info *info;