diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
| commit | db7d4daea91e105e3859cf461d7e53b9b77454b2 (patch) | |
| tree | 9bb65b95440af09e8aca63abe56970dd3360cc57 /include/asm-sparc64/ide.h | |
| parent | 9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff) | |
Merge with Linux 2.2.8.
Diffstat (limited to 'include/asm-sparc64/ide.h')
| -rw-r--r-- | include/asm-sparc64/ide.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-sparc64/ide.h b/include/asm-sparc64/ide.h index 503acdb27..191b95cb2 100644 --- a/include/asm-sparc64/ide.h +++ b/include/asm-sparc64/ide.h @@ -1,4 +1,4 @@ -/* $Id: ide.h,v 1.11 1998/08/12 22:19:37 ecd Exp $ +/* $Id: ide.h,v 1.12 1999/04/17 14:25:29 davem Exp $ * ide.h: Ultra/PCI specific IDE glue. * * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu) @@ -123,7 +123,7 @@ static __inline__ void ide_insw(unsigned long port, unsigned long count) { volatile unsigned short *data_port; - unsigned long end = (unsigned long)dst + count; + unsigned long end = (unsigned long)dst + (count << 1); u16 *ps = dst; u32 *pi; @@ -154,7 +154,7 @@ static __inline__ void ide_outsw(unsigned long port, unsigned long count) { volatile unsigned short *data_port; - unsigned long end = (unsigned long)src + count; + unsigned long end = (unsigned long)src + (count << 1); const u16 *ps = src; const u32 *pi; |