diff --git a/[refs] b/[refs] index 3a829574303f..2783f07666e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a46303ca3bbbbe153630bc4882f83c38c949d171 +refs/heads/master: ecb4f3879d197ed8c248592acfc2741280d20045 diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c index 30def84cea22..78578ee59557 100644 --- a/trunk/drivers/staging/slicoss/slicoss.c +++ b/trunk/drivers/staging/slicoss/slicoss.c @@ -3046,7 +3046,7 @@ static void slic_card_cleanup(struct sliccard *card) kfree(card); } -static void __devexit slic_entry_remove(struct pci_dev *pcidev) +static void slic_entry_remove(struct pci_dev *pcidev) { struct net_device *dev = pci_get_drvdata(pcidev); u32 mmio_start = 0;