---

yaml --- r: 338097 b: refs/heads/master c: bbe0bf9 h: refs/heads/master i: 338095: a46f5e6 v: v3
git-mirror · Nov 21, 2012 · 96fe66c · 96fe66c
1 parent 1357c26
commit 96fe66c
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: 99c28f10913018e4dae5db1a571120237a97e951
+refs/heads/master: bbe0bf96cc77b0ca891f1bfb765433e33364c58f
diff --git a/trunk/drivers/staging/net/pc300_drv.c b/trunk/drivers/staging/net/pc300_drv.c
@@ -3646,7 +3646,7 @@ static struct pci_driver cpc_driver = {
 	.name           = "pc300",
 	.id_table       = cpc_pci_dev_id,
 	.probe          = cpc_init_one,
-	.remove         = __devexit_p(cpc_remove_one),
+	.remove         = cpc_remove_one,
 };
 
 static int __init cpc_init(void)