From 00c6ff368324fb1a8ad9fbcb53f7b67a1deee2b2 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:20:57 -0500 Subject: [PATCH] --- yaml --- r: 338098 b: refs/heads/master c: 095d0bb5e1644f435a5ee83da95332b410c85d2e h: refs/heads/master 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 8abc3223980f..2ef16c989ee8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bbe0bf96cc77b0ca891f1bfb765433e33364c58f +refs/heads/master: 095d0bb5e1644f435a5ee83da95332b410c85d2e diff --git a/trunk/drivers/staging/octeon/ethernet.c b/trunk/drivers/staging/octeon/ethernet.c index 683bedc74dde..b48196a98412 100644 --- a/trunk/drivers/staging/octeon/ethernet.c +++ b/trunk/drivers/staging/octeon/ethernet.c @@ -874,7 +874,7 @@ MODULE_DEVICE_TABLE(of, cvm_oct_match); static struct platform_driver cvm_oct_driver = { .probe = cvm_oct_probe, - .remove = __devexit_p(cvm_oct_remove), + .remove = cvm_oct_remove, .driver = { .owner = THIS_MODULE, .name = KBUILD_MODNAME,