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 /net/wanrouter | |
| 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 'net/wanrouter')
| -rw-r--r-- | net/wanrouter/wanproc.c | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/net/wanrouter/wanproc.c b/net/wanrouter/wanproc.c index 91696d57e..cb8419990 100644 --- a/net/wanrouter/wanproc.c +++ b/net/wanrouter/wanproc.c @@ -90,17 +90,7 @@ static int wandev_get_info(char* buf, char** start, off_t offs, int len); */ static struct file_operations router_fops = { - NULL, /* lseek */ - router_proc_read, /* read */ - NULL, /* write */ - NULL, /* readdir */ - NULL, /* select */ - NULL, /* ioctl */ - NULL, /* mmap */ - NULL, /* no special open code */ - NULL, /* flush */ - NULL, /* no special release code */ - NULL /* can't fsync */ + read: router_proc_read, }; static struct inode_operations router_inode = @@ -117,9 +107,6 @@ static struct inode_operations router_inode = NULL, /* rename */ NULL, /* readlink */ NULL, /* follow_link */ - NULL, /* get_block */ - NULL, /* readpage */ - NULL, /* writepage */ NULL, /* truncate */ router_proc_perms, /* permission */ NULL /* revalidate */ @@ -131,17 +118,8 @@ static struct inode_operations router_inode = static struct file_operations wandev_fops = { - NULL, /* lseek */ - router_proc_read, /* read */ - NULL, /* write */ - NULL, /* readdir */ - NULL, /* select */ - wanrouter_ioctl, /* ioctl */ - NULL, /* mmap */ - NULL, /* no special open code */ - NULL, /* flush */ - NULL, /* no special release code */ - NULL /* can't fsync */ + read: router_proc_read, + ioctl: wanrouter_ioctl, }; static struct inode_operations wandev_inode = @@ -158,9 +136,6 @@ static struct inode_operations wandev_inode = NULL, /* rename */ NULL, /* readlink */ NULL, /* follow_link */ - NULL, /* get_block */ - NULL, /* readpage */ - NULL, /* writepage */ NULL, /* truncate */ router_proc_perms, /* permission */ NULL /* revalidate */ |