Merge branch 'linux-2.6' into for-2.6.22

[linux-drm-fsl-dcu.git] / arch / powerpc / kernel / of_platform.c

diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
index d2fd9863318c4d40527df09ef5920642cee728a6..908ed7926db4e60ee3e3a4c2d3459b165ebbbc3c 100644 (file)
--- a/arch/powerpc/kernel/of_platform.c
+++ b/arch/powerpc/kernel/of_platform.c
@@ -476,9 +476,6 @@ static struct of_platform_driver of_pci_phb_driver = {
        .name = "of-pci",
        .match_table = of_pci_phb_ids,
        .probe = of_pci_phb_probe,
-       .driver = {
-              .multithread_probe = 1,
-       },
 };
 
 static __init int of_pci_phb_init(void)