Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[sfrench/cifs-2.6.git] / include / asm-ppc / pci-bridge.h

diff --git a/include/asm-ppc/pci-bridge.h b/include/asm-ppc/pci-bridge.h
index 95672ddfe5288811f4a16b5edb95dc22effcc6fe..9d5230689b31dbf3d2e4b549301c82c9cca21dd2 100644 (file)
--- a/include/asm-ppc/pci-bridge.h
+++ b/include/asm-ppc/pci-bridge.h
@@ -138,11 +138,11 @@ static inline unsigned char bridge_swizzle(unsigned char pin,
 extern int pciauto_bus_scan(struct pci_controller *, int);
 
 #ifdef CONFIG_PCI
-extern unsigned int pci_address_to_pio(phys_addr_t address);
+extern unsigned long pci_address_to_pio(phys_addr_t address);
 #else
-static inline unsigned int pci_address_to_pio(phys_addr_t address)
+static inline unsigned long pci_address_to_pio(phys_addr_t address)
 {
-       return (unsigned int)-1;
+       return (unsigned long)-1;
 }
 #endif