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 /fs/proc/proc_misc.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 'fs/proc/proc_misc.c')
| -rw-r--r-- | fs/proc/proc_misc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 00b09e6a7..3ad4bfabf 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c @@ -29,6 +29,7 @@ #include <linux/smp.h> #include <linux/signal.h> #include <linux/module.h> +#include <linux/init.h> #include <asm/uaccess.h> #include <asm/pgtable.h> @@ -593,9 +594,8 @@ static ssize_t write_profile(struct file * file, const char * buf, } static struct file_operations proc_profile_operations = { - NULL, /* lseek */ - read_profile, - write_profile, + read: read_profile, + write: write_profile, }; static struct inode_operations proc_profile_inode_operations = { @@ -618,7 +618,7 @@ static struct proc_dir_entry proc_root_profile = { 0, &proc_profile_inode_operations }; -void proc_misc_init(void) +void __init proc_misc_init(void) { static struct { char *name; |