Re: Re^2: v1.3.4 ... (kernelconfig: AHA2* is NOT PCI)

Linus Torvalds (Linus.Torvalds@cs.helsinki.fi)
Tue, 27 Jun 1995 14:17:46 +0300


Michael Weller: "Re^2: v1.3.4 ... (kernelconfig: AHA2* is NOT PCI)" (Jun 27, 11:20):
>
> I guess someone should fix the config file b4 we get flooded with complains:
> Where is the 274x or 284x driver?

The aic7xx driver should be able to handle them all, and one way to
check this is to just compile your kernel with PCI support even if you
just have VLB/EISA/whatever. Silly, yes.

The other alternative is to use something like this (untested, please
tell me if this works) on top of 1.3.4..

Linus
----------
diff -u --recursive --new-file v1.3.4/linux/arch/i386/config.in linux/arch/i386/config.in
--- v1.3.4/linux/arch/i386/config.in Tue Jun 27 14:11:30 1995
+++ linux/arch/i386/config.in Tue Jun 27 09:12:36 1995
@@ -92,9 +92,7 @@
bool 'Adaptec AHA152X support' CONFIG_SCSI_AHA152X y
bool 'Adaptec AHA1542 support' CONFIG_SCSI_AHA1542 n
bool 'Adaptec AHA1740 support' CONFIG_SCSI_AHA1740 y
-if [ "$CONFIG_PCI" = "y" ]; then
- bool 'Adaptec AHA274X/284X/294X support' CONFIG_SCSI_AIC7XXX n
-fi
+bool 'Adaptec AHA274X/284X/294X support' CONFIG_SCSI_AIC7XXX n
bool 'BusLogic SCSI support' CONFIG_SCSI_BUSLOGIC n
bool 'EATA-DMA (DPT,NEC&ATT for ISA,EISA,PCI) support' CONFIG_SCSI_EATA_DMA n
bool 'UltraStor 14F/34F support' CONFIG_SCSI_U14_34F n
diff -u --recursive --new-file v1.3.4/linux/drivers/scsi/aic7xxx.c linux/drivers/scsi/aic7xxx.c
--- v1.3.4/linux/drivers/scsi/aic7xxx.c Tue Jun 27 14:11:37 1995
+++ linux/drivers/scsi/aic7xxx.c Tue Jun 27 09:16:25 1995
@@ -976,6 +976,7 @@
static
void aha294x_config(struct aic7xxx_host_config *p, va_list ap)
{
+#ifdef CONFIG_PCI
int error;
unsigned long io_port;
unsigned char bus, device_fn, irq;
@@ -1042,6 +1043,7 @@
*/
printk("aha294x: extended translation %sabled\n",
p->extended ? "en" : "dis");
+#endif
}

static
@@ -1246,6 +1248,7 @@
}
}

+#ifdef CONFIG_PCI
/*
* PCI-bus probe.
*/
@@ -1264,6 +1267,7 @@
index += 1;
}
}
+#endif

template->name = (char *)aic7xxx_info(NULL);
return(found);
----------