diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-12-19 22:54:51 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-12-20 00:18:09 -0500 |
commit | bf5e2ba28f24f82a64524ef4772c9ebe12e2cd2a (patch) | |
tree | f35c139d124a9276b71260c13c8bddf0aa02b4d7 /include/asm-powerpc/pci-bridge.h | |
parent | fe2d338cdcc628e0abdb4f70570a7fa864c617db (diff) |
[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-bridge.h')
-rw-r--r-- | include/asm-powerpc/pci-bridge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/pci-bridge.h b/include/asm-powerpc/pci-bridge.h index fed8f52071f1..4aeef7f3d766 100644 --- a/include/asm-powerpc/pci-bridge.h +++ b/include/asm-powerpc/pci-bridge.h | |||
@@ -235,7 +235,7 @@ extern void pcibios_remove_pci_devices(struct pci_bus *bus); | |||
235 | 235 | ||
236 | /** Discover new pci devices under this bus, and add them */ | 236 | /** Discover new pci devices under this bus, and add them */ |
237 | extern void pcibios_add_pci_devices(struct pci_bus *bus); | 237 | extern void pcibios_add_pci_devices(struct pci_bus *bus); |
238 | extern void pcibios_fixup_new_pci_devices(struct pci_bus *bus, int fix_bus); | 238 | extern void pcibios_fixup_new_pci_devices(struct pci_bus *bus); |
239 | 239 | ||
240 | extern int pcibios_remove_root_bus(struct pci_controller *phb); | 240 | extern int pcibios_remove_root_bus(struct pci_controller *phb); |
241 | 241 | ||