commit bed59275810a55500e885cbdc5c2a0507f13c00e
author Stephen Rothwell <sfr@canb.auug.org.au> Sun Mar 04 17:04:44 2007 +1100
committer Paul Mackerras <paulus@samba.org> Fri Mar 09 15:03:26 2007 +1100
tree 9f0fba370b8a65a15c19ecab9e48df3f9264dc13
parent be9e95b17e150c7b6933cb2f1e1c46a501976080

[POWERPC] Allow pSeries to build without CONFIG_PCI

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

include/asm-powerpc/ppc-pci.h

diff --git a/include/asm-powerpc/ppc-pci.h b/include/asm-powerpc/ppc-pci.h
index ab6eddb..4a05340 100644
--- a/include/asm-powerpc/ppc-pci.h
+++ b/include/asm-powerpc/ppc-pci.h
@@ -10,6 +10,8 @@
 #define _ASM_POWERPC_PPC_PCI_H
 #ifdef __KERNEL__
 
+#ifdef CONFIG_PCI
+
 #include <linux/pci.h>
 #include <asm/pci-bridge.h>
 
@@ -126,5 +128,10 @@
 
 #endif
 
+#else /* CONFIG_PCI */
+static inline void find_and_init_phbs(void) { }
+static inline void init_pci_config_tokens(void) { }
+#endif /* !CONFIG_PCI */
+
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_PPC_PCI_H */