diff options
Diffstat (limited to 'drivers/platform/x86/apple-gmux.c')
-rw-r--r-- | drivers/platform/x86/apple-gmux.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c index db8f63841b42..f74bfcbb7bad 100644 --- a/drivers/platform/x86/apple-gmux.c +++ b/drivers/platform/x86/apple-gmux.c | |||
@@ -411,8 +411,7 @@ static int gmux_resume(struct pnp_dev *pnp) | |||
411 | return 0; | 411 | return 0; |
412 | } | 412 | } |
413 | 413 | ||
414 | static int __devinit gmux_probe(struct pnp_dev *pnp, | 414 | static int gmux_probe(struct pnp_dev *pnp, const struct pnp_device_id *id) |
415 | const struct pnp_device_id *id) | ||
416 | { | 415 | { |
417 | struct apple_gmux_data *gmux_data; | 416 | struct apple_gmux_data *gmux_data; |
418 | struct resource *res; | 417 | struct resource *res; |
@@ -577,7 +576,7 @@ err_free: | |||
577 | return ret; | 576 | return ret; |
578 | } | 577 | } |
579 | 578 | ||
580 | static void __devexit gmux_remove(struct pnp_dev *pnp) | 579 | static void gmux_remove(struct pnp_dev *pnp) |
581 | { | 580 | { |
582 | struct apple_gmux_data *gmux_data = pnp_get_drvdata(pnp); | 581 | struct apple_gmux_data *gmux_data = pnp_get_drvdata(pnp); |
583 | 582 | ||
@@ -609,7 +608,7 @@ static const struct pnp_device_id gmux_device_ids[] = { | |||
609 | static struct pnp_driver gmux_pnp_driver = { | 608 | static struct pnp_driver gmux_pnp_driver = { |
610 | .name = "apple-gmux", | 609 | .name = "apple-gmux", |
611 | .probe = gmux_probe, | 610 | .probe = gmux_probe, |
612 | .remove = __devexit_p(gmux_remove), | 611 | .remove = gmux_remove, |
613 | .id_table = gmux_device_ids, | 612 | .id_table = gmux_device_ids, |
614 | .suspend = gmux_suspend, | 613 | .suspend = gmux_suspend, |
615 | .resume = gmux_resume | 614 | .resume = gmux_resume |