diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-12-20 04:54:51 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-20 06:18:09 +0100 |
| commit | bf5e2ba28f24f82a64524ef4772c9ebe12e2cd2a (patch) | |
| tree | f35c139d124a9276b71260c13c8bddf0aa02b4d7 /include/asm-powerpc/pci.h | |
| parent | [POWERPC] Merge pcibios_resource_to_bus/bus_to_resource (diff) | |
| download | linux-bf5e2ba28f24f82a64524ef4772c9ebe12e2cd2a.tar.xz linux-bf5e2ba28f24f82a64524ef4772c9ebe12e2cd2a.zip | |
[POWERPC] Merge PCI resource fixups
The PCI code in 32 and 64 bits fixes up resources differently.
32 bits uses a header quirk plus handles bridges in pcibios_fixup_bus()
while 64 bits does things in various places depending on whether you
are using OF probing, using PCI hotplug, etc...
This merges those by basically using the 32 bits approach for both,
with various tweaks to make 64 bits work with the new approach.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/pci.h')
| -rw-r--r-- | include/asm-powerpc/pci.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-powerpc/pci.h b/include/asm-powerpc/pci.h index 2883f566709d..9899d893c162 100644 --- 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 */ |