Merge tag 'devicetree-for-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/robh...

[cascardo/linux.git] / drivers / memory / omap-gpmc.c

diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index 15508df..4721b59 100644 (file)
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -2134,8 +2134,7 @@ no_timings:
        /* is child a common bus? */
        if (of_match_node(of_default_bus_match_table, child))
                /* create children and other common bus children */
-               if (of_platform_populate(child, of_default_bus_match_table,
-                                        NULL, &pdev->dev))
+               if (of_platform_default_populate(child, NULL, &pdev->dev))
                        goto err_child_fail;
 
        return 0;