diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
| commit | 99a7e12f34b3661a0d1354eef83a0eef4df5e34c (patch) | |
| tree | 3560aca9ca86792f9ab7bd87861ea143a1b3c7a3 /drivers/block/xd.c | |
| parent | e73a04659c0b8cdee4dd40e58630e2cf63afb316 (diff) | |
Merge with Linux 2.3.38.
Diffstat (limited to 'drivers/block/xd.c')
| -rw-r--r-- | drivers/block/xd.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/block/xd.c b/drivers/block/xd.c index 6d2bde45a..363c0ae71 100644 --- a/drivers/block/xd.c +++ b/drivers/block/xd.c @@ -147,18 +147,10 @@ static struct gendisk xd_gendisk = { (void *) xd_info, /* internal */ NULL /* next */ }; -static struct file_operations xd_fops = { - NULL, /* lseek - default */ - block_read, /* read - general block-dev read */ - block_write, /* write - general block-dev write */ - NULL, /* readdir - bad */ - NULL, /* poll */ - xd_ioctl, /* ioctl */ - NULL, /* mmap */ - xd_open, /* open */ - NULL, /* flush */ - xd_release, /* release */ - block_fsync /* fsync */ +static struct block_device_operations xd_fops = { + open: xd_open, + release: xd_release, + ioctl: xd_ioctl, }; static DECLARE_WAIT_QUEUE_HEAD(xd_wait_int); static DECLARE_WAIT_QUEUE_HEAD(xd_wait_open); |