diff --git a/[refs] b/[refs] index eadabc17bae8..ede3c1f32061 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f307da94dbc5308ec4163030785e79cf193b5cf7 +refs/heads/master: 38930755b86082b8d44da038d0ec0b912a708679 diff --git a/trunk/drivers/staging/vme/devices/vme_pio2_core.c b/trunk/drivers/staging/vme/devices/vme_pio2_core.c index dad8281915bf..35c5a147849f 100644 --- a/trunk/drivers/staging/vme/devices/vme_pio2_core.c +++ b/trunk/drivers/staging/vme/devices/vme_pio2_core.c @@ -156,7 +156,7 @@ static struct vme_driver pio2_driver = { .name = driver_name, .match = pio2_match, .probe = pio2_probe, - .remove = __devexit_p(pio2_remove), + .remove = pio2_remove, }; diff --git a/trunk/drivers/staging/vme/devices/vme_user.c b/trunk/drivers/staging/vme/devices/vme_user.c index e3731eb2bab1..8209c2d3c151 100644 --- a/trunk/drivers/staging/vme/devices/vme_user.c +++ b/trunk/drivers/staging/vme/devices/vme_user.c @@ -619,7 +619,7 @@ static struct vme_driver vme_user_driver = { .name = driver_name, .match = vme_user_match, .probe = vme_user_probe, - .remove = __devexit_p(vme_user_remove), + .remove = vme_user_remove, };