diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-03 21:46:06 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-03 21:46:06 +0000 |
| commit | 3e414096429d55fbc8116171bba3487647bbe638 (patch) | |
| tree | 2b5fcfd9d16fa3a32c829fc2076f6e3785b43374 /include/asm-arm/dma.h | |
| parent | 20b23bfcf36fcb2d16d8b844501072541970637c (diff) | |
Merge with Linux 2.4.0-test3-pre2.
Diffstat (limited to 'include/asm-arm/dma.h')
| -rw-r--r-- | include/asm-arm/dma.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-arm/dma.h b/include/asm-arm/dma.h index b67e33a9d..67db9ab90 100644 --- a/include/asm-arm/dma.h +++ b/include/asm-arm/dma.h @@ -6,7 +6,8 @@ typedef unsigned int dmach_t; #include <linux/config.h> #include <linux/kernel.h> #include <linux/spinlock.h> -#include <asm/irq.h> +#include <asm/system.h> +#include <asm/memory.h> #include <asm/arch/dma.h> /* |