diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-12-04 03:58:56 +0000 |
| commit | 1d67e90f19a7acfd9a05dc59678e7d0c5090bd0d (patch) | |
| tree | 357efc7b93f8f5102110d20d293f41360ec212fc /drivers/block/cpqarray.c | |
| parent | aea27b2e18d69af87e673972246e66657b4fa274 (diff) | |
Merge with Linux 2.3.21.
Diffstat (limited to 'drivers/block/cpqarray.c')
| -rw-r--r-- | drivers/block/cpqarray.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c index 1b2be20dd..579fbc13a 100644 --- a/drivers/block/cpqarray.c +++ b/drivers/block/cpqarray.c @@ -212,6 +212,7 @@ struct file_operations ida_fops = { */ static void ida_procinit(int i) { +#ifdef CONFIG_PROC_FS struct proc_dir_entry *pd; if (proc_array == NULL) { @@ -224,6 +225,7 @@ static void ida_procinit(int i) if (!pd) return; pd->read_proc = ida_proc_get_info; pd->data = hba[i]; +#endif } /* @@ -356,7 +358,9 @@ void cleanup_module(void) } } } +#ifdef CONFIG_PROC_FS remove_proc_entry("array", &proc_root); +#endif kfree(ida); kfree(ida_sizes); kfree(ida_hardsizes); |