diff --git a/[refs] b/[refs] index ede3c1f32061..10d142b94790 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38930755b86082b8d44da038d0ec0b912a708679 +refs/heads/master: 2c4ae9d21867ec2b771085898682ab3db46341c0 diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c index 4b213a318f34..e9fe27debf7b 100644 --- a/trunk/drivers/staging/xgifb/XGI_main_26.c +++ b/trunk/drivers/staging/xgifb/XGI_main_26.c @@ -2127,7 +2127,7 @@ static struct pci_driver xgifb_driver = { .name = "xgifb", .id_table = xgifb_pci_table, .probe = xgifb_probe, - .remove = __devexit_p(xgifb_remove) + .remove = xgifb_remove };