diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /drivers/char/vc_screen.c | |
parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (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/vc_screen.c')
-rw-r--r-- | drivers/char/vc_screen.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c index 5fc98155b..e099b4ac3 100644 --- a/drivers/char/vc_screen.c +++ b/drivers/char/vc_screen.c @@ -297,17 +297,10 @@ vcs_open(struct inode *inode, struct file *filp) } static struct file_operations vcs_fops = { - vcs_lseek, /* lseek */ - vcs_read, /* read */ - vcs_write, /* write */ - NULL, /* readdir */ - NULL, /* poll */ - NULL, /* ioctl */ - NULL, /* mmap */ - vcs_open, /* open */ - NULL, /* flush */ - NULL, /* release */ - NULL /* fsync */ + llseek: vcs_lseek, + read: vcs_read, + write: vcs_write, + open: vcs_open, }; int __init vcs_init(void) |