summaryrefslogtreecommitdiffstats
path: root/drivers/char/ftape/zftape
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-23 00:40:54 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-23 00:40:54 +0000
commit529c593ece216e4aaffd36bd940cb94f1fa63129 (patch)
tree78f1c0b805f5656aa7b0417a043c5346f700a2cf /drivers/char/ftape/zftape
parent0bd079751d25808d1972baee5c4eaa1db2227257 (diff)
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'drivers/char/ftape/zftape')
-rw-r--r--drivers/char/ftape/zftape/zftape-init.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/char/ftape/zftape/zftape-init.c b/drivers/char/ftape/zftape/zftape-init.c
index 97fb1cce4..4795eafdc 100644
--- a/drivers/char/ftape/zftape/zftape-init.c
+++ b/drivers/char/ftape/zftape/zftape-init.c
@@ -121,17 +121,12 @@ static int zft_write(struct inode *ino, struct file *fp, const char *buff,
static struct file_operations zft_cdev =
{
- NULL, /* llseek */
- zft_read, /* read */
- zft_write, /* write */
- NULL, /* readdir */
- NULL, /* select */
- zft_ioctl, /* ioctl */
- zft_mmap, /* mmap */
- zft_open, /* open */
- NULL, /* flush */
- zft_close, /* release */
- NULL, /* fsync */
+ read: zft_read,
+ write: zft_write,
+ ioctl: zft_ioctl,
+ mmap: zft_mmap,
+ open: zft_open,
+ release: zft_close,
};
/* Open floppy tape device