diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-06-17 13:20:30 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-06-17 13:20:30 +0000 |
| commit | 7acb77a6e7bddd4c4c5aa975bbf976927c013798 (patch) | |
| tree | 4139829ec6edb85f73774bb95cdec376758bfc73 /fs/proc/array.c | |
| parent | 64d58d4c8cd6a89ee218301ec0dc0ebfec91a4db (diff) | |
Merge with 2.1.43.
Diffstat (limited to 'fs/proc/array.c')
| -rw-r--r-- | fs/proc/array.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index 516e87813..518ef1b4c 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -154,8 +154,6 @@ static long read_profile(struct inode *inode, struct file *file, return read; } - - /* * Writing to /proc/profile resets the counters * @@ -1042,6 +1040,9 @@ extern int get_smp_prof_list(char *); #ifdef CONFIG_ZORRO extern int zorro_get_list(char *); #endif +#if defined (CONFIG_AMIGA) || defined (CONFIG_ATARI) +extern int get_hardware_list(char *); +#endif static long get_root_array(char * page, int type, char **start, off_t offset, unsigned long length) @@ -1126,6 +1127,10 @@ static long get_root_array(char * page, int type, char **start, case PROC_ZORRO: return zorro_get_list(page); #endif +#if defined (CONFIG_AMIGA) || defined (CONFIG_ATARI) + case PROC_HARDWARE: + return get_hardware_list(page); +#endif } return -EBADF; } @@ -1232,7 +1237,6 @@ struct inode_operations proc_array_inode_operations = { NULL, /* mknod */ NULL, /* rename */ NULL, /* readlink */ - NULL, /* follow_link */ NULL, /* readpage */ NULL, /* writepage */ NULL, /* bmap */ @@ -1278,7 +1282,6 @@ struct inode_operations proc_arraylong_inode_operations = { NULL, /* mknod */ NULL, /* rename */ NULL, /* readlink */ - NULL, /* follow_link */ NULL, /* readpage */ NULL, /* writepage */ NULL, /* bmap */ |