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/linux/fd.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/linux/fd.h')
-rw-r--r-- | include/linux/fd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/fd.h b/include/linux/fd.h index 627a9d2bd..dc8439540 100644 --- a/include/linux/fd.h +++ b/include/linux/fd.h @@ -116,7 +116,7 @@ typedef char floppy_drive_name[16]; * Drive parameters (user modifiable) */ struct floppy_drive_params { - signed char cmos; /* cmos type */ + signed char cmos; /* CMOS type */ /* Spec2 is (HLD<<1 | ND), where HLD is head load time (1=2ms, 2=4 ms * etc) and ND is set means no DMA. Hardcoded to 6 (HLD=6ms, use DMA). @@ -189,7 +189,7 @@ enum { * Current drive state (not directly modifiable by user, readonly) */ struct floppy_drive_struct { - signed char flags; + unsigned long flags; /* values for these flags */ #define FD_NEED_TWADDLE (1 << FD_NEED_TWADDLE_BIT) #define FD_VERIFY (1 << FD_VERIFY_BIT) |