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/sgi/char/shmiq.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/sgi/char/shmiq.c')
| -rw-r--r-- | drivers/sgi/char/shmiq.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/drivers/sgi/char/shmiq.c b/drivers/sgi/char/shmiq.c index 153df30be..c4f707598 100644 --- a/drivers/sgi/char/shmiq.c +++ b/drivers/sgi/char/shmiq.c @@ -1,4 +1,4 @@ -/* $Id: shmiq.c,v 1.17 2000/02/05 06:47:30 ralf Exp $ +/* $Id: shmiq.c,v 1.18 2000/02/18 00:24:43 ralf Exp $ * * shmiq.c: shared memory input queue driver * written 1997 Miguel de Icaza (miguel@nuclecu.unam.mx) @@ -429,21 +429,14 @@ shmiq_qcntl_close (struct inode *inode, struct file *filp) } -static struct -file_operations shmiq_fops = +static struct file_operations shmiq_fops = { - NULL, /* seek */ - NULL, /* read */ - NULL, /* write */ - NULL, /* readdir */ - shmiq_qcntl_poll, /* poll */ - shmiq_qcntl_ioctl, /* ioctl */ - shmiq_qcntl_mmap, /* mmap */ - shmiq_qcntl_open, /* open */ - NULL, /* flush */ - shmiq_qcntl_close, /* close */ - NULL, /* fsync */ - shmiq_qcntl_fasync, /* fasync */ + poll: shmiq_qcntl_poll, + ioctl: shmiq_qcntl_ioctl, + mmap: shmiq_qcntl_mmap, + open: shmiq_qcntl_open, + release: shmiq_qcntl_close, + fasync: shmiq_qcntl_fasync, }; void |