diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
commit | f969d69ba9f952e5bdd38278e25e26a3e4a61a70 (patch) | |
tree | b3530d803df59d726afaabebc6626987dee1ca05 /include/asm-mips/dma.h | |
parent | a10ce7ef2066b455d69187643ddf2073bfc4db24 (diff) |
Merge with 2.3.27.
Diffstat (limited to 'include/asm-mips/dma.h')
-rw-r--r-- | include/asm-mips/dma.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/asm-mips/dma.h b/include/asm-mips/dma.h index 0805352df..54e938ef4 100644 --- a/include/asm-mips/dma.h +++ b/include/asm-mips/dma.h @@ -1,4 +1,4 @@ -/* $Id: dma.h,v 1.5 1999/10/17 19:55:23 harald Exp $ +/* $Id: dma.h,v 1.6 1999/12/30 14:22:47 raiko Exp $ * linux/include/asm/dma.h: Defines for using and allocating dma channels. * Written by Hennus Bergman, 1992. * High DMA channel support & info by Hannu Savolainen @@ -83,11 +83,7 @@ * Deskstations or Acer PICA but not the much more versatile DMA logic used * for the local devices on Acer PICA or Magnums. */ -#if !defined(CONFIG_SGI_IP22) && !defined(CONFIG_DECSTATION) #define MAX_DMA_ADDRESS (PAGE_OFFSET + 0x01000000) -#else -#define MAX_DMA_ADDRESS (~0UL) -#endif /* 8237 DMA controllers */ #define IO_DMA1_BASE 0x00 /* 8 bit slave DMA, channels 0..3 */ |