Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/pasemi

[linux-2.6] / arch / powerpc / platforms / 40x / virtex.c

diff --git a/arch/powerpc/platforms/40x/virtex.c b/arch/powerpc/platforms/40x/virtex.c
index 14bbc328170fd76e26e1a5479b2aded9794e802a..43fcc8e9f7d0f7610c73333fe86162ad47134247 100644 (file)
--- a/arch/powerpc/platforms/40x/virtex.c
+++ b/arch/powerpc/platforms/40x/virtex.c
@@ -17,14 +17,11 @@
 
 static int __init virtex_device_probe(void)
 {
-       if (!machine_is(virtex))
-               return 0;
-
        of_platform_bus_probe(NULL, NULL, NULL);
 
        return 0;
 }
-device_initcall(virtex_device_probe);
+machine_device_initcall(virtex, virtex_device_probe);
 
 static int __init virtex_probe(void)
 {