Merge branch 'for-2.6.23' into merge

1 files changed, 5 insertions, 4 deletions

diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c
index ffaf6c5c517b..47f0e0857f0e 100644
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
@@ -110,8 +110,6 @@ pcibios_fixup_new_pci_devices(struct pci_bus *bus, int fix_bus)
                         }
                 }
         }
-
-        eeh_add_device_tree_late(bus);
 }
 EXPORT_SYMBOL_GPL(pcibios_fixup_new_pci_devices);
 
@@ -139,6 +137,8 @@ pcibios_pci_config_bridge(struct pci_dev *dev)
 
         /* Make the discovered devices available */
         pci_bus_add_devices(child_bus);
+
+        eeh_add_device_tree_late(child_bus);
         return 0;
 }
 
@@ -171,6 +171,7 @@ pcibios_add_pci_devices(struct pci_bus * bus)
                 if (!list_empty(&bus->devices)) {
                         pcibios_fixup_new_pci_devices(bus, 0);
                         pci_bus_add_devices(bus);
+                        eeh_add_device_tree_late(bus);
                 }
         } else if (mode == PCI_PROBE_NORMAL) {
                 /* use legacy probe */
@@ -179,6 +180,7 @@ pcibios_add_pci_devices(struct pci_bus * bus)
                 if (num) {
                         pcibios_fixup_new_pci_devices(bus, 1);
                         pci_bus_add_devices(bus);
+                        eeh_add_device_tree_late(bus);
                 }
 
                 list_for_each_entry(dev, &bus->devices, bus_list)
@@ -200,8 +202,6 @@ struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
         rtas_setup_phb(phb);
         pci_process_bridge_OF_ranges(phb, dn, 0);
 
-        pci_setup_phb_io_dynamic(phb, primary);
-
         pci_devs_phb_init_dynamic(phb);
 
         if (dn->child)
@@ -210,6 +210,7 @@ struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
         scan_phb(phb);
         pcibios_fixup_new_pci_devices(phb->bus, 0);
         pci_bus_add_devices(phb->bus);
+        eeh_add_device_tree_late(phb->bus);
 
         return phb;
 }