Messages in this thread Patch in this message | | | Date | Wed, 13 Oct 1999 14:00:54 +0200 (MEST) | From | Oliver Neukum <> | Subject | new init scheme breaks aha152x.c |
| |
Hi,
here is a preliminary patch that makes it work. Is there anyone who has two cards of that type ?
Regards Oliver Neukum
--- /home/oliver/Desktop/linux/drivers/scsi/aha152x.c.alt Wed Oct 13 10:05:45 1999 +++ /home/oliver/Desktop/linux/drivers/scsi/aha152x.c Wed Oct 13 10:43:42 1999 @@ -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 @@ } } +#if 0 /* called from init/main.c */ void aha152x_setup(char *str, int *ints) { @@ -742,6 +745,27 @@ } 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; +} + +__setup("aha152x=",do_aha152x_setup); /* * Test, if port_base is valid. | |