From 6f977d20df30108d03cddee089df39ea0c9b1ae1 Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:20:50 -0500
Subject: [PATCH] --- yaml --- r: 338037 b: refs/heads/master c:
 0b5e4092241eb4015a91e01d9aca32c214ea8b50 h: refs/heads/master i:   338035:
 fa52b6dbc0aa3e57d844414799a9c6aa369c3ddb 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 e2a11ca9d3d8..781871d06524 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe5c49b3325e38dd350fc3ceaf30b8f8a3f136b8
+refs/heads/master: 0b5e4092241eb4015a91e01d9aca32c214ea8b50
diff --git a/trunk/drivers/staging/et131x/et131x.c b/trunk/drivers/staging/et131x/et131x.c
index d017e67d2ffa..525a7cbec1c9 100644
--- a/trunk/drivers/staging/et131x/et131x.c
+++ b/trunk/drivers/staging/et131x/et131x.c
@@ -5099,7 +5099,7 @@ static struct pci_driver et131x_driver = {
 	.name		= DRIVER_NAME,
 	.id_table	= et131x_pci_table,
 	.probe		= et131x_pci_setup,
-	.remove		= __devexit_p(et131x_pci_remove),
+	.remove		= et131x_pci_remove,
 	.driver.pm	= ET131X_PM_OPS,
 };