diff --git a/[refs] b/[refs] index 2ef16c989ee8..0a96716f6cb5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 095d0bb5e1644f435a5ee83da95332b410c85d2e +refs/heads/master: 2e0d79c522388209b1ffd857fe6ab7117a945792 diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c index ee0f0e4e41ad..ad85e6e34c52 100644 --- a/trunk/drivers/staging/slicoss/slicoss.c +++ b/trunk/drivers/staging/slicoss/slicoss.c @@ -3820,7 +3820,7 @@ static struct pci_driver slic_driver = { .name = DRV_NAME, .id_table = slic_pci_tbl, .probe = slic_entry_probe, - .remove = __devexit_p(slic_entry_remove), + .remove = slic_entry_remove, }; static int __init slic_module_init(void)