projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[powerpc.git]
/
include
/
asm-ppc
/
pci-bridge.h
diff --git
a/include/asm-ppc/pci-bridge.h
b/include/asm-ppc/pci-bridge.h
index
e58c78f
..
9d52306
100644
(file)
--- a/
include/asm-ppc/pci-bridge.h
+++ b/
include/asm-ppc/pci-bridge.h
@@
-137,5
+137,14
@@
static inline unsigned char bridge_swizzle(unsigned char pin,
*/
extern int pciauto_bus_scan(struct pci_controller *, int);
*/
extern int pciauto_bus_scan(struct pci_controller *, int);
+#ifdef CONFIG_PCI
+extern unsigned long pci_address_to_pio(phys_addr_t address);
+#else
+static inline unsigned long pci_address_to_pio(phys_addr_t address)
+{
+ return (unsigned long)-1;
+}
+#endif
+
#endif
#endif /* __KERNEL__ */
#endif
#endif /* __KERNEL__ */