diff options
Diffstat (limited to 'drivers/video/vermilion/vermilion.c')
-rw-r--r-- | drivers/video/vermilion/vermilion.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/video/vermilion/vermilion.c b/drivers/video/vermilion/vermilion.c index 4709edc3cb7f..0aa516fc59cd 100644 --- a/drivers/video/vermilion/vermilion.c +++ b/drivers/video/vermilion/vermilion.c | |||
@@ -393,7 +393,7 @@ static void vmlfb_release_devices(struct vml_par *par) | |||
393 | * Free up allocated resources for a device. | 393 | * Free up allocated resources for a device. |
394 | */ | 394 | */ |
395 | 395 | ||
396 | static void __devexit vml_pci_remove(struct pci_dev *dev) | 396 | static void vml_pci_remove(struct pci_dev *dev) |
397 | { | 397 | { |
398 | struct fb_info *info; | 398 | struct fb_info *info; |
399 | struct vml_info *vinfo; | 399 | struct vml_info *vinfo; |
@@ -452,8 +452,7 @@ static void vmlfb_set_pref_pixel_format(struct fb_var_screeninfo *var) | |||
452 | * struct per pipe. Currently we have only one pipe. | 452 | * struct per pipe. Currently we have only one pipe. |
453 | */ | 453 | */ |
454 | 454 | ||
455 | static int __devinit vml_pci_probe(struct pci_dev *dev, | 455 | static int vml_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) |
456 | const struct pci_device_id *id) | ||
457 | { | 456 | { |
458 | struct vml_info *vinfo; | 457 | struct vml_info *vinfo; |
459 | struct fb_info *info; | 458 | struct fb_info *info; |
@@ -1060,7 +1059,7 @@ static struct pci_driver vmlfb_pci_driver = { | |||
1060 | .name = "vmlfb", | 1059 | .name = "vmlfb", |
1061 | .id_table = vml_ids, | 1060 | .id_table = vml_ids, |
1062 | .probe = vml_pci_probe, | 1061 | .probe = vml_pci_probe, |
1063 | .remove = __devexit_p(vml_pci_remove) | 1062 | .remove = vml_pci_remove, |
1064 | }; | 1063 | }; |
1065 | 1064 | ||
1066 | static void __exit vmlfb_cleanup(void) | 1065 | static void __exit vmlfb_cleanup(void) |