commit 145d01e4287b8cbf50f87c3283e33bf5c84e8468
author Stephen Rothwell <sfr@canb.auug.org.au> Tue Jun 21 17:15:52 2005 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue Jun 21 18:46:31 2005 -0700
tree 368786294f6cf7b8b909aceaac8cc4d90be2ab7d
parent 7f74e79fe749da035cc150446f02aec29938a5c8

[PATCH] ppc64 iSeries: allow build with no PCI

This patch allows iSeries to build with CONFIG_PCI=n.  This is useful for
partitions that have only virtual I/O.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

include/asm-ppc64/iommu.h

diff --git a/include/asm-ppc64/iommu.h b/include/asm-ppc64/iommu.h
index d9b5337..729de5c 100644
--- a/include/asm-ppc64/iommu.h
+++ b/include/asm-ppc64/iommu.h
@@ -137,8 +137,12 @@
 extern void iommu_init_early_iSeries(void);
 extern void iommu_init_early_u3(void);
 
+#ifdef CONFIG_PCI
 extern void pci_iommu_init(void);
 extern void pci_direct_iommu_init(void);
+#else
+static inline void pci_iommu_init(void) { }
+#endif
 
 extern void alloc_u3_dart_table(void);