diff --git a/[refs] b/[refs]
index 5ebbf7632896..2a10e0c3f4d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abe118b48f6ba7e28bd97c84eccb4484a2441732
+refs/heads/master: a0c2feb18035dfe90bac813504bf1030d54b68f0
diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c
index ad85e6e34c52..30def84cea22 100644
--- a/trunk/drivers/staging/slicoss/slicoss.c
+++ b/trunk/drivers/staging/slicoss/slicoss.c
@@ -3678,7 +3678,7 @@ static u32 slic_card_locate(struct adapter *adapter)
 	return 0;
 }
 
-static int __devinit slic_entry_probe(struct pci_dev *pcidev,
+static int slic_entry_probe(struct pci_dev *pcidev,
 			       const struct pci_device_id *pci_tbl_entry)
 {
 	static int cards_found;