---

yaml --- r: 338036 b: refs/heads/master c: fe5c49b h: refs/heads/master v: v3
git-mirror · Nov 21, 2012 · 14a9d34 · 14a9d34
1 parent fa52b6d
commit 14a9d34
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;