diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
| commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
| tree | 5085c389f09da78182b899d19fe1068b619a69dd /init | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index 8dd6fc91a..90d3d56f1 100644 --- a/init/main.c +++ b/init/main.c @@ -340,6 +340,9 @@ extern void mdacon_setup(char *str, int *ints); #ifdef CONFIG_LTPC extern void ltpc_setup(char *str, int *ints); #endif +#ifdef CONFIG_BLK_CPQ_DA +extern void cpqarray_setup(char *str, int *ints); +#endif #if defined(CONFIG_SYSVIPC) extern void ipc_init(void); @@ -878,6 +881,9 @@ static struct kernel_param cooked_params[] __initdata = { #ifdef CONFIG_LTPC { "ltpc=", ltpc_setup }, #endif +#ifdef CONFIG_BLK_CPQ_DA + { "smart2=", cpqarray_setup }, +#endif { 0, 0 } }; |