diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
commit | 9f9f3e6e8548a596697778337110a423c384b6f3 (patch) | |
tree | 5dd4b290ef532cf5ecb058e1a92cd3435afeac8c /include/asm-mips64/dma.h | |
parent | d5c9a365ee7d2fded249aa5abfc5e89587583029 (diff) |
Merge with Linux 2.3.49.
Diffstat (limited to 'include/asm-mips64/dma.h')
-rw-r--r-- | include/asm-mips64/dma.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-mips64/dma.h b/include/asm-mips64/dma.h index b109ce0ff..ef380f1d4 100644 --- a/include/asm-mips64/dma.h +++ b/include/asm-mips64/dma.h @@ -1,4 +1,4 @@ -/* $Id: dma.h,v 1.3 1999/12/04 03:59:12 ralf Exp $ +/* $Id: dma.h,v 1.4 2000/01/29 01:42:28 ralf Exp $ * * linux/include/asm/dma.h: Defines for using and allocating dma channels. * Written by Hennus Bergman, 1992. @@ -13,7 +13,6 @@ #ifndef _ASM_DMA_H #define _ASM_DMA_H -#include <linux/config.h> #include <asm/io.h> /* need byte IO */ #include <linux/spinlock.h> /* And spinlocks */ #include <linux/delay.h> |