diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-11-16 02:42:18 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-11-18 23:11:30 -0500 |
commit | 5131d4d83858e208f634622dc4a2e7042f796950 (patch) | |
tree | bb7cd6c76b771dff17751bdf7847990f383a6a77 | |
parent | 0961dbfbb89276281b47e80a46071d876aebe7a3 (diff) |
[POWERPC] Fix declaration of pcibios_free_controller
pcibios_free_controller() is now available for both 32 and 64 bits
but the header only declares it for 64 bits. This moves the
declaration down next to the pcibios_alloc_controller() one.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | include/asm-powerpc/pci-bridge.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-powerpc/pci-bridge.h b/include/asm-powerpc/pci-bridge.h index dc318458b5fe..d8bdc79db12e 100644 --- a/include/asm-powerpc/pci-bridge.h +++ b/include/asm-powerpc/pci-bridge.h | |||
@@ -246,7 +246,6 @@ static inline struct pci_controller *pci_bus_to_host(struct pci_bus *bus) | |||
246 | return PCI_DN(busdn)->phb; | 246 | return PCI_DN(busdn)->phb; |
247 | } | 247 | } |
248 | 248 | ||
249 | extern void pcibios_free_controller(struct pci_controller *phb); | ||
250 | 249 | ||
251 | extern void isa_bridge_find_early(struct pci_controller *hose); | 250 | extern void isa_bridge_find_early(struct pci_controller *hose); |
252 | 251 | ||
@@ -282,9 +281,11 @@ extern void | |||
282 | pci_process_bridge_OF_ranges(struct pci_controller *hose, | 281 | pci_process_bridge_OF_ranges(struct pci_controller *hose, |
283 | struct device_node *dev, int primary); | 282 | struct device_node *dev, int primary); |
284 | 283 | ||
285 | /* Allocate a new PCI host bridge structure */ | 284 | /* Allocate & free a PCI host bridge structure */ |
286 | extern struct pci_controller * | 285 | extern struct pci_controller * |
287 | pcibios_alloc_controller(struct device_node *dev); | 286 | pcibios_alloc_controller(struct device_node *dev); |
287 | extern void pcibios_free_controller(struct pci_controller *phb); | ||
288 | |||
288 | #ifdef CONFIG_PCI | 289 | #ifdef CONFIG_PCI |
289 | extern unsigned long pci_address_to_pio(phys_addr_t address); | 290 | extern unsigned long pci_address_to_pio(phys_addr_t address); |
290 | extern int pcibios_vaddr_is_ioport(void __iomem *address); | 291 | extern int pcibios_vaddr_is_ioport(void __iomem *address); |