diff --git a/[refs] b/[refs]
index 21d6b1cfbd7f..8abc3223980f 100644
--- 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
index cb0f8d932b0c..b8e0480abad1 100644
--- 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)