From 14a9d3432119ae2d7411bb0f94d5e84fb18a2085 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:22:12 -0500
Subject: [PATCH] --- yaml --- r: 338036 b: refs/heads/master c:
 fe5c49b3325e38dd350fc3ceaf30b8f8a3f136b8 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c65b0bf9029d..e2a11ca9d3d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 596c5dd302aad8dea6be12d32d5dfa5d2f72673d
+refs/heads/master: fe5c49b3325e38dd350fc3ceaf30b8f8a3f136b8
diff --git a/trunk/drivers/staging/et131x/et131x.c b/trunk/drivers/staging/et131x/et131x.c
index 8bfe756e040c..d017e67d2ffa 100644
--- a/trunk/drivers/staging/et131x/et131x.c
+++ b/trunk/drivers/staging/et131x/et131x.c
@@ -4897,7 +4897,7 @@ static const struct net_device_ops et131x_netdev_ops = {
  * contained in the pci_device_id table. This routine is the equivalent to
  * a device insertion routine.
  */
-static int __devinit et131x_pci_setup(struct pci_dev *pdev,
+static int et131x_pci_setup(struct pci_dev *pdev,
 			       const struct pci_device_id *ent)
 {
 	struct net_device *netdev;