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/qpmouse.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/qpmouse.c')
-rw-r--r-- | drivers/char/qpmouse.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/char/qpmouse.c b/drivers/char/qpmouse.c index 3de17ad5c..096cf6afb 100644 --- a/drivers/char/qpmouse.c +++ b/drivers/char/qpmouse.c @@ -290,18 +290,12 @@ repeat: } struct file_operations qp_fops = { - NULL, /* seek */ - read_qp, - write_qp, - NULL, /* readdir */ - poll_qp, - NULL, /* ioctl */ - NULL, /* mmap */ - open_qp, - NULL, /* flush */ - release_qp, - NULL, - fasync_qp, + read: read_qp, + write: write_qp, + poll: poll_qp, + open: open_qp, + release: release_qp, + fasync: fasync_qp, }; /* |