[POWERPC] Merge PCI resource fixups

[deliverable/linux.git] / include / asm-powerpc / pci.h

diff --git a/include/asm-powerpc/pci.h b/include/asm-powerpc/pci.h
index 2883f566709d9c1ff570878bfb89475eec5dc5b1..9899d893c162cd7947ebf68f897a565c42fb81eb 100644 (file)
--- a/include/asm-powerpc/pci.h
+++ b/include/asm-powerpc/pci.h
@@ -196,9 +196,6 @@ static inline struct resource *pcibios_select_root(struct pci_dev *pdev,
        return root;
 }
 
-extern void pcibios_fixup_device_resources(struct pci_dev *dev,
-                       struct pci_bus *bus);
-
 extern void pcibios_setup_new_device(struct pci_dev *dev);
 
 extern void pcibios_claim_one_bus(struct pci_bus *b);
@@ -226,5 +223,8 @@ extern void pci_resource_to_user(const struct pci_dev *dev, int bar,
                                 const struct resource *rsrc,
                                 resource_size_t *start, resource_size_t *end);
 
+extern void pcibios_do_bus_setup(struct pci_bus *bus);
+extern void pcibios_fixup_of_probed_bus(struct pci_bus *bus);
+
 #endif /* __KERNEL__ */
 #endif /* __ASM_POWERPC_PCI_H */