Merge branch 'linux-2.6' into for-2.6.22

2007-04-30 12:38:01 +10:00
parent 34f6d749c0 b9099ff63c
commit 49e1900d4c
1949 changed files with 101563 additions and 76742 deletions
--- 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)