Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / net / ibm_newemac / core.c

diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 0f1d4e96cf893884b3e6f0a09fe5c9a41ca75d6d..eeec7bc2ce74bf9c472c9179f621d2e43930ece3 100644 (file)
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -2339,11 +2339,11 @@ static int __devinit emac_wait_deps(struct emac_instance *dev)
                deps[EMAC_DEP_MDIO_IDX].phandle = dev->mdio_ph;
        if (dev->blist && dev->blist > emac_boot_list)
                deps[EMAC_DEP_PREV_IDX].phandle = 0xffffffffu;
-       bus_register_notifier(&of_platform_bus_type, &emac_of_bus_notifier);
+       bus_register_notifier(&platform_bus_type, &emac_of_bus_notifier);
        wait_event_timeout(emac_probe_wait,
                           emac_check_deps(dev, deps),
                           EMAC_PROBE_DEP_TIMEOUT);
-       bus_unregister_notifier(&of_platform_bus_type, &emac_of_bus_notifier);
+       bus_unregister_notifier(&platform_bus_type, &emac_of_bus_notifier);
        err = emac_check_deps(dev, deps) ? 0 : -ENODEV;
        for (i = 0; i < EMAC_DEP_COUNT; i++) {
                if (deps[i].node)