Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux-2.6-block.git] / drivers / bus / uniphier-system-bus.c

diff --git a/drivers/bus/uniphier-system-bus.c b/drivers/bus/uniphier-system-bus.c
index 350b7309c26d714c1a80c2a56b2a2d9acf1040bb..1e6e0269edcc18ed9f7c8e4cc65e6ce6595c8683 100644 (file)
--- a/drivers/bus/uniphier-system-bus.c
+++ b/drivers/bus/uniphier-system-bus.c
@@ -257,8 +257,7 @@ static int uniphier_system_bus_probe(struct platform_device *pdev)
        uniphier_system_bus_set_reg(priv);
 
        /* Now, the bus is configured.  Populate platform_devices below it */
-       return of_platform_populate(dev->of_node, of_default_bus_match_table,
-                                   NULL, dev);
+       return of_platform_default_populate(dev->of_node, NULL, dev);
 }
 
 static const struct of_device_id uniphier_system_bus_match[] = {