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

[cascardo/linux.git] / arch / powerpc / platforms / 44x / canyonlands.c

diff --git a/arch/powerpc/platforms/44x/canyonlands.c b/arch/powerpc/platforms/44x/canyonlands.c
index 22ca543..157f4ce 100644 (file)
--- a/arch/powerpc/platforms/44x/canyonlands.c
+++ b/arch/powerpc/platforms/44x/canyonlands.c
@@ -53,11 +53,10 @@ machine_device_initcall(canyonlands, ppc460ex_device_probe);
 
 static int __init ppc460ex_probe(void)
 {
-       unsigned long root = of_get_flat_dt_root();
-       if (of_flat_dt_is_compatible(root, "amcc,canyonlands")) {
+       if (of_machine_is_compatible("amcc,canyonlands")) {
                pci_set_flags(PCI_REASSIGN_ALL_RSRC);
                return 1;
-               }
+       }
        return 0;
 }