diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
| commit | 168660f24dfc46c2702acbe4701a446f42a59578 (patch) | |
| tree | f431368afbf6b1b71809cf3fd904d800ea126f4d /include/asm-arm/arch-arc/dma.h | |
| parent | 6420f767924fa73b0ea267864d96820815f4ba5a (diff) | |
Merge with Linux 2.4.0-test5-pre3.
Diffstat (limited to 'include/asm-arm/arch-arc/dma.h')
| -rw-r--r-- | include/asm-arm/arch-arc/dma.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/include/asm-arm/arch-arc/dma.h b/include/asm-arm/arch-arc/dma.h index 49e184769..77d1dfddf 100644 --- a/include/asm-arm/arch-arc/dma.h +++ b/include/asm-arm/arch-arc/dma.h @@ -12,24 +12,15 @@ #ifndef __ASM_ARCH_DMA_H #define __ASM_ARCH_DMA_H -#include <linux/config.h> - #define MAX_DMA_ADDRESS 0x03000000 - -#ifdef CONFIG_ARCH_ARC #define MAX_DMA_CHANNELS 3 +/* ARC */ #define DMA_VIRTUAL_FLOPPY0 0 #define DMA_VIRTUAL_FLOPPY1 1 #define DMA_VIRTUAL_SOUND 2 -#endif - -#ifdef CONFIG_ARCH_A5K -#define MAX_DMA_CHANNELS 2 -#define DMA_VIRTUAL_FLOPPY 0 -#define DMA_VIRTUAL_SOUND 1 -#define DMA_FLOPPY DMA_VIRTUAL_FLOPPY -#endif +/* A5K */ +#define DMA_FLOPPY DMA_VIRTUAL_FLOPPY0 #endif /* _ASM_ARCH_DMA_H */ |