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 /drivers/block/floppy.c | |
| parent | 257730f99381dd26e10b832fce4c94cae7ac1176 (diff) | |
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'drivers/block/floppy.c')
| -rw-r--r-- | drivers/block/floppy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index b8ca2ed8e..e555aa9d9 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -233,7 +233,7 @@ static inline void fallback_on_nodma_alloc(char **addr, size_t l) /* End dma memory related stuff */ -static unsigned int fake_change = 0; +static unsigned long fake_change = 0; static int initialising=1; static inline int TYPE(kdev_t x) { @@ -3837,6 +3837,7 @@ static struct file_operations floppy_fops = { fd_ioctl, /* ioctl */ NULL, /* mmap */ floppy_open, /* open */ + NULL, /* flush */ floppy_release, /* release */ block_fsync, /* fsync */ NULL, /* fasync */ |