aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2005-12-14 23:00:57 -0500
committerPaul Mackerras <paulus@samba.org>2006-01-08 23:05:56 -0500
commitf2c4583a381c584c8c025048071a120cc9562ded (patch)
tree53d6a1d30a3be72f021738c97853cff55a800070 /include/asm-powerpc
parenta04c8780fd234aeeba5e87f7e37beffd05ef21ae (diff)
[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-powerpc')
-rw-r--r--include/asm-powerpc/pci-bridge.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-powerpc/pci-bridge.h b/include/asm-powerpc/pci-bridge.h
index 3d94e55f25d6..443c75a16571 100644
--- a/include/asm-powerpc/pci-bridge.h
+++ b/include/asm-powerpc/pci-bridge.h
@@ -158,11 +158,11 @@ pcibios_alloc_controller(struct device_node *dev);
158extern void pcibios_free_controller(struct pci_controller *phb); 158extern void pcibios_free_controller(struct pci_controller *phb);
159 159
160#ifdef CONFIG_PCI 160#ifdef CONFIG_PCI
161extern unsigned int pci_address_to_pio(phys_addr_t address); 161extern unsigned long pci_address_to_pio(phys_addr_t address);
162#else 162#else
163static inline unsigned int pci_address_to_pio(phys_addr_t address) 163static inline unsigned long pci_address_to_pio(phys_addr_t address)
164{ 164{
165 return (unsigned int)-1; 165 return (unsigned long)-1;
166} 166}
167#endif 167#endif
168 168