summaryrefslogtreecommitdiffstats
path: root/include/asm-ppc64
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2005-06-21 17:15:52 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-21 18:46:31 -0700
commit145d01e4287b8cbf50f87c3283e33bf5c84e8468 (patch)
tree368786294f6cf7b8b909aceaac8cc4d90be2ab7d /include/asm-ppc64
parent7f74e79fe749da035cc150446f02aec29938a5c8 (diff)
downloadop-kernel-dev-145d01e4287b8cbf50f87c3283e33bf5c84e8468.zip
op-kernel-dev-145d01e4287b8cbf50f87c3283e33bf5c84e8468.tar.gz
[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>
Diffstat (limited to 'include/asm-ppc64')
-rw-r--r--include/asm-ppc64/dma.h3
-rw-r--r--include/asm-ppc64/iommu.h4
2 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-ppc64/dma.h b/include/asm-ppc64/dma.h
index d693b80..dfd1f69 100644
--- a/include/asm-ppc64/dma.h
+++ b/include/asm-ppc64/dma.h
@@ -27,6 +27,8 @@
/* Doesn't really apply... */
#define MAX_DMA_ADDRESS (~0UL)
+#if !defined(CONFIG_PPC_ISERIES) || defined(CONFIG_PCI)
+
#define dma_outb outb
#define dma_inb inb
@@ -323,4 +325,5 @@ extern int isa_dma_bridge_buggy;
#else
#define isa_dma_bridge_buggy (0)
#endif
+#endif /* !defined(CONFIG_PPC_ISERIES) || defined(CONFIG_PCI) */
#endif /* _ASM_DMA_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_pSeries(void);
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);
OpenPOWER on IntegriCloud