diff --git a/[refs] b/[refs]
index 172d25a43cf9..b753511db9ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8aa1be45f9cacc95efd0720bbed497d15ff7cc31
+refs/heads/master: 0cae4685a602a8bf9a86fa2417d6c035c09d6341
diff --git a/trunk/drivers/staging/net/pc300_drv.c b/trunk/drivers/staging/net/pc300_drv.c
index 142eab493594..7281797ffe9d 100644
--- a/trunk/drivers/staging/net/pc300_drv.c
+++ b/trunk/drivers/staging/net/pc300_drv.c
@@ -3607,7 +3607,7 @@ cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	return err;
 }
 
-static void __devexit cpc_remove_one(struct pci_dev *pdev)
+static void cpc_remove_one(struct pci_dev *pdev)
 {
 	pc300_t *card = pci_get_drvdata(pdev);