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/telephony | |
| 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/telephony')
| -rw-r--r-- | drivers/telephony/ixj.c | 20 | ||||
| -rw-r--r-- | drivers/telephony/phonedev.c | 11 |
2 files changed, 7 insertions, 24 deletions
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c index 0d590da23..9665598b9 100644 --- a/drivers/telephony/ixj.c +++ b/drivers/telephony/ixj.c @@ -3922,20 +3922,12 @@ static int ixj_fasync(int fd, struct file *file_p, int mode) struct file_operations ixj_fops = { - NULL, /* ixj_lseek */ - ixj_enhanced_read, - ixj_enhanced_write, - NULL, /* ixj_readdir */ - ixj_poll, - ixj_ioctl, - NULL, /* ixj_mmap */ -// ixj_open, - NULL, /* ixj_open */ - NULL, /* ixj_flush */ - ixj_release, - NULL, /* ixj_fsync */ - ixj_fasync, /* ixj_fasync */ - NULL /* lock */ + read: ixj_enhanced_read, + write: ixj_enhanced_write, + poll: ixj_poll, + ioctl: ixj_ioctl, + release: ixj_release, + fasync: ixj_fasync, }; static int ixj_linetest(int board) diff --git a/drivers/telephony/phonedev.c b/drivers/telephony/phonedev.c index fa6d41556..21f850d9b 100644 --- a/drivers/telephony/phonedev.c +++ b/drivers/telephony/phonedev.c @@ -112,16 +112,7 @@ void phone_unregister_device(struct phone_device *pfd) static struct file_operations phone_fops = { - NULL, - NULL, - NULL, - NULL, /* readdir */ - NULL, - NULL, - NULL, - phone_open, - NULL, /* flush */ - NULL + open: phone_open, }; /* |