summaryrefslogtreecommitdiff
path: root/include/asm-ppc
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2005-12-15 04:00:57 (GMT)
committerPaul Mackerras <paulus@samba.org>2006-01-09 04:05:56 (GMT)
commitf2c4583a381c584c8c025048071a120cc9562ded (patch)
tree53d6a1d30a3be72f021738c97853cff55a800070 /include/asm-ppc
parenta04c8780fd234aeeba5e87f7e37beffd05ef21ae (diff)
downloadlinux-fsl-qoriq-f2c4583a381c584c8c025048071a120cc9562ded.tar.xz
[PATCH] powerpc: pci_address_to_pio fix
This fixes pci_address_to_pio() to return an unsigned long (to be safe) and fixes a bug in the implementation that caused it to return a bogus IO port number Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-ppc')
-rw-r--r--include/asm-ppc/pci-bridge.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-ppc/pci-bridge.h b/include/asm-ppc/pci-bridge.h
index 95672dd..9d52306 100644
--- 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