patch-2.4.0-test5 linux/include/asm-arm/arch-arc/dma.h

Next file: linux/include/asm-arm/arch-arc/hardware.h
Previous file: linux/include/asm-alpha/pci.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test4/linux/include/asm-arm/arch-arc/dma.h linux/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 */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)