diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
| commit | b8553086288629b4efb77e97f5582e08bc50ad65 (patch) | |
| tree | 0a19bd1c21e148f35c7a0f76baa4f7a056b966b0 /include/asm-mips/floppy.h | |
| parent | 75b6d92f2dd5112b02f4e78cf9f35f9825946ef0 (diff) | |
Merge with 2.4.0-test3-pre4.
Diffstat (limited to 'include/asm-mips/floppy.h')
| -rw-r--r-- | include/asm-mips/floppy.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/asm-mips/floppy.h b/include/asm-mips/floppy.h index 6e5c5c43a..ffdf1b87d 100644 --- a/include/asm-mips/floppy.h +++ b/include/asm-mips/floppy.h @@ -78,7 +78,14 @@ extern struct fd_ops *fd_ops; #define FLOPPY1_TYPE fd_drive_type(1) #define FDC1 fd_ops->fd_getfdaddr1(); -static int FDC2=-1; + +/* + * Hack: The floppy drivrer defines this, before including fdreg.h. We use + * to define FDC2 only one and keep it a static variable in floppy.c. + */ +#ifdef FDPATCHES +static int FDC2 = -1; +#endif #define N_FDC 1 /* do you *really* want a second controller? */ #define N_DRIVE 8 |