diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /include/asm-sparc64/dma.h | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'include/asm-sparc64/dma.h')
| -rw-r--r-- | include/asm-sparc64/dma.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc64/dma.h b/include/asm-sparc64/dma.h index 4afcd5f27..aedfa7ddd 100644 --- a/include/asm-sparc64/dma.h +++ b/include/asm-sparc64/dma.h @@ -1,4 +1,4 @@ -/* $Id: dma.h,v 1.7 1997/04/10 05:13:28 davem Exp $ +/* $Id: dma.h,v 1.8 1998/04/13 07:27:06 davem Exp $ * include/asm-sparc64/dma.h * * Copyright 1996 (C) David S. Miller (davem@caip.rutgers.edu) @@ -74,7 +74,7 @@ extern struct Linux_SBus_DMA *dma_chain; #define DMA_ISESC1(dma) ((dma)->revision == dvmaesc1) /* Main routines in dma.c */ -extern unsigned long dvma_init(struct linux_sbus *, unsigned long); +extern void dvma_init(struct linux_sbus *); /* Fields in the cond_reg register */ /* First, the version identification bits */ |