diff --git a/[refs] b/[refs]
index 9efcab0590b9..8a1f9baa500a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f2409060aba27120f601b2675e1e38754522b7c
+refs/heads/master: c42ef5d21fc16e44361893eca333344022ede328
diff --git a/trunk/drivers/staging/net/pc300_drv.c b/trunk/drivers/staging/net/pc300_drv.c
index b8e0480abad1..142eab493594 100644
--- a/trunk/drivers/staging/net/pc300_drv.c
+++ b/trunk/drivers/staging/net/pc300_drv.c
@@ -3409,7 +3409,7 @@ static void cpc_init_card(pc300_t * card)
 	board_nbr++;
 }
 
-static int __devinit
+static int
 cpc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
 	int err, eeprom_outdated = 0;