diff options
Diffstat (limited to 'drivers/video/cg6.c')
-rw-r--r-- | drivers/video/cg6.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c index 2b5a97058b08..4ffad90bde42 100644 --- a/drivers/video/cg6.c +++ b/drivers/video/cg6.c | |||
@@ -737,8 +737,7 @@ static void cg6_unmap_regs(struct platform_device *op, struct fb_info *info, | |||
737 | info->fix.smem_len); | 737 | info->fix.smem_len); |
738 | } | 738 | } |
739 | 739 | ||
740 | static int __devinit cg6_probe(struct platform_device *op, | 740 | static int __devinit cg6_probe(struct platform_device *op) |
741 | const struct of_device_id *match) | ||
742 | { | 741 | { |
743 | struct device_node *dp = op->dev.of_node; | 742 | struct device_node *dp = op->dev.of_node; |
744 | struct fb_info *info; | 743 | struct fb_info *info; |
@@ -855,7 +854,7 @@ static const struct of_device_id cg6_match[] = { | |||
855 | }; | 854 | }; |
856 | MODULE_DEVICE_TABLE(of, cg6_match); | 855 | MODULE_DEVICE_TABLE(of, cg6_match); |
857 | 856 | ||
858 | static struct of_platform_driver cg6_driver = { | 857 | static struct platform_driver cg6_driver = { |
859 | .driver = { | 858 | .driver = { |
860 | .name = "cg6", | 859 | .name = "cg6", |
861 | .owner = THIS_MODULE, | 860 | .owner = THIS_MODULE, |
@@ -870,12 +869,12 @@ static int __init cg6_init(void) | |||
870 | if (fb_get_options("cg6fb", NULL)) | 869 | if (fb_get_options("cg6fb", NULL)) |
871 | return -ENODEV; | 870 | return -ENODEV; |
872 | 871 | ||
873 | return of_register_platform_driver(&cg6_driver); | 872 | return platform_driver_register(&cg6_driver); |
874 | } | 873 | } |
875 | 874 | ||
876 | static void __exit cg6_exit(void) | 875 | static void __exit cg6_exit(void) |
877 | { | 876 | { |
878 | of_unregister_platform_driver(&cg6_driver); | 877 | platform_driver_unregister(&cg6_driver); |
879 | } | 878 | } |
880 | 879 | ||
881 | module_init(cg6_init); | 880 | module_init(cg6_init); |