From: Andrew Morton <[email-masked]>

Cc: Dominik Brodowski <[email-masked]>
Signed-off-by: Andrew Morton <[email-masked]>
---

 arch/ppc/kernel/pci.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/ppc/kernel/pci.c~pci-and-yenta-pcibios_bus_to_resource-ppc-fix arch/ppc/kernel/pci.c
--- 25-ppc/arch/ppc/kernel/pci.c~pci-and-yenta-pcibios_bus_to_resource-ppc-fix	2005-07-11 22:58:55.000000000 -0700
+++ 25-ppc-akpm/arch/ppc/kernel/pci.c	2005-07-11 22:58:55.000000000 -0700
@@ -160,7 +160,7 @@ void pcibios_resource_to_bus(struct pci_
 }
 EXPORT_SYMBOL(pcibios_resource_to_bus);
 
-void pcibios_resource_to_bus(struct pci_dev *dev, struct resource *res,
+void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
 			     struct pci_bus_region *region)
 {
 	unsigned long offset = 0;
_