[parisc-linux-cvs] DIFF linux-2.5 include/asm-parisc/dma.h

Grant Grundler grundler@dsl2.external.hp.com
Wed, 13 Nov 2002 23:16:37 -0700


Grant Grundler wrote:
> Log message:
> resurrect request_dma() as a macro for (0).
> CONFIG_PARPORT_PC_FIFO invokes request_dma() but will
> do the right thing if it returns 0.

no change in -pa number since any config that linked isn't affected.


diff -u -p -r1.3 -r1.4
--- include/asm-parisc/dma.h    1 Nov 2002 02:46:57 -0000       1.3
+++ include/asm-parisc/dma.h    14 Nov 2002 06:05:32 -0000      1.4
@@ -30,7 +30,6 @@
 */
 #define MAX_DMA_ADDRESS (~0UL)
 
-
 /*
 ** We don't have DMA channels... well V-class does but the
 ** Dynamic DMA Mapping interface will support them... right? :^)
@@ -129,6 +128,9 @@ static __inline__ void disable_dma(unsig
                dma_outb((dmanr & 3) | 4,  DMA2_MASK_REG);
 #endif
 }
+
+/* reserve a DMA channel */
+#define request_dma(dmanr, device_id)  (0)
 
 /* Clear the 'DMA Pointer Flip Flop'.
  * Write 0 for LSB/MSB, 1 for MSB/LSB access.