patch-2.2.11 linux/include/asm-mips/dma.h

• Lines: 23
• Date: Mon Aug 9 12:04:41 1999
• Orig file: v2.2.10/linux/include/asm-mips/dma.h
• Orig date: Tue Oct 20 13:52:53 1998

diff -u --recursive --new-file v2.2.10/linux/include/asm-mips/dma.h linux/include/asm-mips/dma.h
@@ -1,4 +1,4 @@
-/* $Id: dma.h,v 1.2 1998/10/19 21:29:10 ralf Exp $
+/* $Id: dma.h,v 1.2 1999/01/04 16:09:21 ralf 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
@@ -16,6 +16,7 @@
 #include <asm/io.h>			/* need byte IO */
 #include <asm/spinlock.h>		/* And spinlocks */
 #include <linux/delay.h>
+#include <asm/system.h>
 
 
 #ifdef HAVE_REALLY_SLOW_DMA_CONTROLLER
@@ -175,8 +176,6 @@
 		dma_outb(dmanr | 4,  DMA1_MASK_REG);
 	else
 		dma_outb((dmanr & 3) | 4,  DMA2_MASK_REG);
-	/* I hate voodoo programming but .. */
-	udelay(20);
 }
 
 /* Clear the 'DMA Pointer Flip Flop'.