aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2007-03-04 01:04:44 -0500
committerPaul Mackerras <paulus@samba.org>2007-03-08 23:03:26 -0500
commitbed59275810a55500e885cbdc5c2a0507f13c00e (patch)
tree9f0fba370b8a65a15c19ecab9e48df3f9264dc13 /include
parentbe9e95b17e150c7b6933cb2f1e1c46a501976080 (diff)
[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>
Diffstat (limited to 'include')
-rw-r--r--include/asm-powerpc/ppc-pci.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-powerpc/ppc-pci.h b/include/asm-powerpc/ppc-pci.h
index ab6eddb518c7..4a053404bf6b 100644
--- a/include/asm-powerpc/ppc-pci.h
+++ b/include/asm-powerpc/ppc-pci.h
@@ -10,6 +10,8 @@
10#define _ASM_POWERPC_PPC_PCI_H 10#define _ASM_POWERPC_PPC_PCI_H
11#ifdef __KERNEL__ 11#ifdef __KERNEL__
12 12
13#ifdef CONFIG_PCI
14
13#include <linux/pci.h> 15#include <linux/pci.h>
14#include <asm/pci-bridge.h> 16#include <asm/pci-bridge.h>
15 17
@@ -126,5 +128,10 @@ struct device_node * find_device_pe(struct device_node *dn);
126 128
127#endif 129#endif
128 130
131#else /* CONFIG_PCI */
132static inline void find_and_init_phbs(void) { }
133static inline void init_pci_config_tokens(void) { }
134#endif /* !CONFIG_PCI */
135
129#endif /* __KERNEL__ */ 136#endif /* __KERNEL__ */
130#endif /* _ASM_POWERPC_PPC_PCI_H */ 137#endif /* _ASM_POWERPC_PPC_PCI_H */