Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / video / tcx.c

diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c
index ef7a7bd8b503492fec8aa1f56ab678adfe2f06f0..f375e0db6776bcefae43c2e26fa08a213c88d6c3 100644 (file)
--- a/drivers/video/tcx.c
+++ b/drivers/video/tcx.c
@@ -365,7 +365,7 @@ static void tcx_unmap_regs(struct of_device *op, struct fb_info *info,
 static int __devinit tcx_probe(struct of_device *op,
                               const struct of_device_id *match)
 {
-       struct device_node *dp = op->node;
+       struct device_node *dp = op->dev.of_node;
        struct fb_info *info;
        struct tcx_par *par;
        int linebytes, i, err;
@@ -526,12 +526,12 @@ static int __init tcx_init(void)
        if (fb_get_options("tcxfb", NULL))
                return -ENODEV;
 
-       return of_register_driver(&tcx_driver, &of_bus_type);
+       return of_register_platform_driver(&tcx_driver);
 }
 
 static void __exit tcx_exit(void)
 {
-       of_unregister_driver(&tcx_driver);
+       of_unregister_platform_driver(&tcx_driver);
 }
 
 module_init(tcx_init);