diff options
Diffstat (limited to 'drivers/video/mb862xx/mb862xxfb.c')
-rw-r--r-- | drivers/video/mb862xx/mb862xxfb.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/video/mb862xx/mb862xxfb.c b/drivers/video/mb862xx/mb862xxfb.c index b1c4374cf940..c76e663a6cd4 100644 --- a/drivers/video/mb862xx/mb862xxfb.c +++ b/drivers/video/mb862xx/mb862xxfb.c | |||
@@ -550,8 +550,7 @@ static int mb862xx_gdc_init(struct mb862xxfb_par *par) | |||
550 | return 0; | 550 | return 0; |
551 | } | 551 | } |
552 | 552 | ||
553 | static int __devinit of_platform_mb862xx_probe(struct platform_device *ofdev, | 553 | static int __devinit of_platform_mb862xx_probe(struct platform_device *ofdev) |
554 | const struct of_device_id *id) | ||
555 | { | 554 | { |
556 | struct device_node *np = ofdev->dev.of_node; | 555 | struct device_node *np = ofdev->dev.of_node; |
557 | struct device *dev = &ofdev->dev; | 556 | struct device *dev = &ofdev->dev; |
@@ -717,7 +716,7 @@ static struct of_device_id __devinitdata of_platform_mb862xx_tbl[] = { | |||
717 | { /* end */ } | 716 | { /* end */ } |
718 | }; | 717 | }; |
719 | 718 | ||
720 | static struct of_platform_driver of_platform_mb862xxfb_driver = { | 719 | static struct platform_driver of_platform_mb862xxfb_driver = { |
721 | .driver = { | 720 | .driver = { |
722 | .name = DRV_NAME, | 721 | .name = DRV_NAME, |
723 | .owner = THIS_MODULE, | 722 | .owner = THIS_MODULE, |
@@ -1038,7 +1037,7 @@ static int __devinit mb862xxfb_init(void) | |||
1038 | int ret = -ENODEV; | 1037 | int ret = -ENODEV; |
1039 | 1038 | ||
1040 | #if defined(CONFIG_FB_MB862XX_LIME) | 1039 | #if defined(CONFIG_FB_MB862XX_LIME) |
1041 | ret = of_register_platform_driver(&of_platform_mb862xxfb_driver); | 1040 | ret = platform_driver_register(&of_platform_mb862xxfb_driver); |
1042 | #endif | 1041 | #endif |
1043 | #if defined(CONFIG_FB_MB862XX_PCI_GDC) | 1042 | #if defined(CONFIG_FB_MB862XX_PCI_GDC) |
1044 | ret = pci_register_driver(&mb862xxfb_pci_driver); | 1043 | ret = pci_register_driver(&mb862xxfb_pci_driver); |
@@ -1049,7 +1048,7 @@ static int __devinit mb862xxfb_init(void) | |||
1049 | static void __exit mb862xxfb_exit(void) | 1048 | static void __exit mb862xxfb_exit(void) |
1050 | { | 1049 | { |
1051 | #if defined(CONFIG_FB_MB862XX_LIME) | 1050 | #if defined(CONFIG_FB_MB862XX_LIME) |
1052 | of_unregister_platform_driver(&of_platform_mb862xxfb_driver); | 1051 | platform_driver_unregister(&of_platform_mb862xxfb_driver); |
1053 | #endif | 1052 | #endif |
1054 | #if defined(CONFIG_FB_MB862XX_PCI_GDC) | 1053 | #if defined(CONFIG_FB_MB862XX_PCI_GDC) |
1055 | pci_unregister_driver(&mb862xxfb_pci_driver); | 1054 | pci_unregister_driver(&mb862xxfb_pci_driver); |