diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2012-03-15 22:20:13 +0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-21 04:16:12 +0400 |
commit | 1b041885ae1d9938440fc2cf6a444b70ec0a86c9 (patch) | |
tree | 58feb1eb3e72df19161845d418cf9ca714c702d5 /arch/powerpc/include/asm/dma.h | |
parent | bc58450b023c5815e5bc54e6d43edbd1e3576fe6 (diff) | |
download | linux-1b041885ae1d9938440fc2cf6a444b70ec0a86c9.tar.xz |
powerpc: Remove the remaining CONFIG_PPC_ISERIES pieces
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include/asm/dma.h')
-rw-r--r-- | arch/powerpc/include/asm/dma.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/include/asm/dma.h b/arch/powerpc/include/asm/dma.h index a7e06e25c708..adadb9943610 100644 --- a/arch/powerpc/include/asm/dma.h +++ b/arch/powerpc/include/asm/dma.h @@ -34,8 +34,6 @@ /* Doesn't really apply... */ #define MAX_DMA_ADDRESS (~0UL) -#if !defined(CONFIG_PPC_ISERIES) || defined(CONFIG_PCI) - #ifdef HAVE_REALLY_SLOW_DMA_CONTROLLER #define dma_outb outb_p #else @@ -354,7 +352,5 @@ extern int isa_dma_bridge_buggy; #define isa_dma_bridge_buggy (0) #endif -#endif /* !defined(CONFIG_PPC_ISERIES) || defined(CONFIG_PCI) */ - #endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_DMA_H */ |