diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-21 22:34:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-21 22:34:01 +0000 |
| commit | 9e30c3705aed9fbec4c3304570e4d6e707856bcb (patch) | |
| tree | b19e6acb5a67af31a4e7742e05c2166dc3f1444c /drivers/scsi/aha152x.c | |
| parent | 72919904796333a20c6a5d5c380091b42e407aa9 (diff) | |
Merge with Linux 2.3.22.
Diffstat (limited to 'drivers/scsi/aha152x.c')
| -rw-r--r-- | drivers/scsi/aha152x.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c index 6fc7e3f24..5c011500a 100644 --- a/drivers/scsi/aha152x.c +++ b/drivers/scsi/aha152x.c @@ -344,6 +344,8 @@ #include <linux/ioport.h> #include <linux/proc_fs.h> #include <linux/interrupt.h> +#include <linux/init.h> +#include <linux/kernel.h> #include "aha152x.h" #include <linux/stat.h> @@ -714,6 +716,7 @@ static int getphase(struct Scsi_Host *shpnt) } } +#if 0 /* called from init/main.c */ void aha152x_setup(char *str, int *ints) { @@ -742,6 +745,29 @@ void aha152x_setup(char *str, int *ints) } else setup_count++; } +#endif + +static int __init do_aha152x_setup (char * str) +{ + if (setup_count > 2) { + printk(KERN_ERR"aha152x: you can only configure up to two +controllers\n"); + return 0; + } + + setup[setup_count].conf = str; + get_option(&str,&setup[setup_count].io_port); + get_option(&str,&setup[setup_count].irq); + get_option(&str,&setup[setup_count].scsiid); + get_option(&str,&setup[setup_count].reconnect); + + setup_count++; + return 1; +} + +#ifndef MODULE +__setup("aha152x=",do_aha152x_setup); +#endif /* * Test, if port_base is valid. |