From aeebe5b8e0dfdb03e29520c96c846320071c9f3e Mon Sep 17 00:00:00 2001
From: Bill Pemberton <wfp5p@virginia.edu>
Date: Mon, 19 Nov 2012 13:26:42 -0500
Subject: [PATCH] --- yaml --- r: 338125 b: refs/heads/master c:
 f7e2f350f16f3fc2cb7920ccc202ba5310daed3e h: refs/heads/master i:   338123:
 0e650ecf01a6a8fcd338d71822ad92d24dbdbb7f v: v3

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

diff --git a/[refs] b/[refs]
index b753511db9ba..a432f64e2ece 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0cae4685a602a8bf9a86fa2417d6c035c09d6341
+refs/heads/master: f7e2f350f16f3fc2cb7920ccc202ba5310daed3e
diff --git a/trunk/drivers/staging/octeon/ethernet.c b/trunk/drivers/staging/octeon/ethernet.c
index 9276667f4b34..ef32dc1bbc80 100644
--- a/trunk/drivers/staging/octeon/ethernet.c
+++ b/trunk/drivers/staging/octeon/ethernet.c
@@ -813,7 +813,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int __devexit cvm_oct_remove(struct platform_device *pdev)
+static int cvm_oct_remove(struct platform_device *pdev)
 {
 	int port;