diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 23:45:22 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 23:45:22 +0000 |
| commit | 5b35aa5cd29bb111d847b2a2ed18110acbfb1f44 (patch) | |
| tree | c7bbaa1137528330d3c74d14056ef7016a52be72 /include/asm-ppc/dma.h | |
| parent | 511bcd7c5924ce9e98ad1cb851988f7448dfef0f (diff) | |
Merge with Linux 2.3.24.
Diffstat (limited to 'include/asm-ppc/dma.h')
| -rw-r--r-- | include/asm-ppc/dma.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/asm-ppc/dma.h b/include/asm-ppc/dma.h index dfd6a240b..5cac2be5e 100644 --- a/include/asm-ppc/dma.h +++ b/include/asm-ppc/dma.h @@ -99,18 +99,21 @@ extern unsigned long ISA_DMA_THRESHOLD; /* used in nasty hack for sound - see prep_setup_arch() -- Cort */ extern long ppc_cs4232_dma, ppc_cs4232_dma2; -#ifdef CONFIG_CS4232 +#if defined(CONFIG_CS4232) +#if defined(CONFIG_PREP) || defined(CONFIG_ALL_PPC) #define SND_DMA1 ppc_cs4232_dma #define SND_DMA2 ppc_cs4232_dma2 -#else -#ifdef CONFIG_MSS +#else /* !CONFIG_PREP && !CONFIG_ALL_PPC */ +#define SND_DMA1 -1 +#define SND_DMA2 -1 +#endif /* !CONFIG_PREP */ +#elif defined(CONFIG_MSS) #define SND_DMA1 CONFIG_MSS_DMA #define SND_DMA2 CONFIG_MSS_DMA2 #else #define SND_DMA1 -1 #define SND_DMA2 -1 #endif -#endif /* 8237 DMA controllers */ #define IO_DMA1_BASE 0x00 /* 8 bit slave DMA, channels 0..3 */ @@ -203,6 +206,7 @@ static __inline__ void enable_dma(unsigned int dmanr) */ unsigned char ucDmaCmd=0x00; +#if defined(CONFIG_PREP) || defined(CONFIG_ALL_PPC) if(_prep_type==_PREP_Radstone) { switch(ucSystemType) @@ -227,6 +231,7 @@ static __inline__ void enable_dma(unsigned int dmanr) } } } +#endif /* CONFIG_PREP || CONFIG_ALL_PPC */ if (dmanr != 4) { |