diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
| commit | 03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch) | |
| tree | 88db8dba75ae06ba3bad08e42c5e52efc162535c /include/asm-alpha/floppy.h | |
| parent | 257730f99381dd26e10b832fce4c94cae7ac1176 (diff) | |
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'include/asm-alpha/floppy.h')
| -rw-r--r-- | include/asm-alpha/floppy.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-alpha/floppy.h b/include/asm-alpha/floppy.h index 2f847ddb0..36fb2c5e9 100644 --- a/include/asm-alpha/floppy.h +++ b/include/asm-alpha/floppy.h @@ -54,8 +54,8 @@ static int FDC2 = -1; /* * Most Alphas have no problems with floppy DMA crossing 64k borders, - * except for XL. It is also the only one with DMA limits, so we use - * that to test in the generic kernel. + * except for XL and RUFFIAN. They are also the only one with DMA + * limits, so we use that to test in the generic kernel. */ #define __CROSS_64KB(a,s) \ @@ -66,7 +66,7 @@ static int FDC2 = -1; #ifdef CONFIG_ALPHA_GENERIC # define CROSS_64KB(a,s) (__CROSS_64KB(a,s) && ~alpha_mv.max_dma_address) #else -# ifdef CONFIG_ALPHA_XL +# if defined(CONFIG_ALPHA_XL) || defined(CONFIG_ALPHA_RUFFIAN) # define CROSS_64KB(a,s) __CROSS_64KB(a,s) # else # define CROSS_64KB(a,s) (0) |