Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / powerpc / platforms / 85xx / tqm85xx.c

diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c
index 8f29bbce5360447c3a719fb6b74877b417f35aed..5e847d0b47c80b5a63308e7e41a1ec4c8dce8917 100644 (file)
--- a/arch/powerpc/platforms/85xx/tqm85xx.c
+++ b/arch/powerpc/platforms/85xx/tqm85xx.c
@@ -186,21 +186,21 @@ static int __init declare_of_platform_devices(void)
 }
 machine_device_initcall(tqm85xx, declare_of_platform_devices);
 
+static const char *board[] __initdata = {
+       "tqc,tqm8540",
+       "tqc,tqm8541",
+       "tqc,tqm8548",
+       "tqc,tqm8555",
+       "tqc,tqm8560",
+       NULL
+};
+
 /*
  * Called very early, device-tree isn't unflattened
  */
 static int __init tqm85xx_probe(void)
 {
-       unsigned long root = of_get_flat_dt_root();
-
-       if ((of_flat_dt_is_compatible(root, "tqc,tqm8540")) ||
-           (of_flat_dt_is_compatible(root, "tqc,tqm8541")) ||
-           (of_flat_dt_is_compatible(root, "tqc,tqm8548")) ||
-           (of_flat_dt_is_compatible(root, "tqc,tqm8555")) ||
-           (of_flat_dt_is_compatible(root, "tqc,tqm8560")))
-               return 1;
-
-       return 0;
+       return of_flat_dt_match(of_get_flat_dt_root(), board);
 }
 
 define_machine(tqm85xx) {