Add support for the Qlogic ISP SCSI && FC/AL Adapters

4 files changed, 16 insertions, 4 deletions

diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 39b65ef..8a3d7e5 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC,v 1.106 1998/02/16 00:29:05 msmith Exp $
+#	$Id: GENERIC,v 1.107 1998/02/16 23:57:03 msmith Exp $
 
 machine		"i386"
 cpu		"I386_CPU"
@@ -70,6 +70,7 @@ controller	ncr0
 controller	amd0
 controller	ahb0
 controller	ahc0
+controller	isp0
 
 controller	bt0	at isa? port "IO_BT0" bio irq ? vector bt_isa_intr
 controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 57235d2..871e05c 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.426 1998/04/19 23:31:25 julian Exp $
+#	$Id: LINT,v 1.427 1998/04/20 04:30:47 julian Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -1300,6 +1300,10 @@ options	"EISA_SLOTS=12"
 # The `ncr' device provides support for the NCR 53C810 and 53C825
 # self-contained SCSI host adapters.
 #
+# The `isp' device provides support for the Qlogic ISP 1020, 1040
+# nd 1040B PCI SCSI host adapters, as well as the Qlogic ISP 2100
+# FC/AL Host Adapter.
+#
 # The `amd' device provides support for the Tekram DC-390 and 390T
 # SCSI host adapters, but is expected to work with any AMD 53c974
 # PCI SCSI chip and the AMD Ethernet+SCSI Combo chip, after some
@@ -1340,6 +1344,7 @@ options	"EISA_SLOTS=12"
 controller	pci0
 controller	ahc1
 controller	ncr0
+controller	isp0
 controller	amd0
 device		de0
 device		fxp0
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 57235d2..871e05c 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.426 1998/04/19 23:31:25 julian Exp $
+#	$Id: LINT,v 1.427 1998/04/20 04:30:47 julian Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -1300,6 +1300,10 @@ options	"EISA_SLOTS=12"
 # The `ncr' device provides support for the NCR 53C810 and 53C825
 # self-contained SCSI host adapters.
 #
+# The `isp' device provides support for the Qlogic ISP 1020, 1040
+# nd 1040B PCI SCSI host adapters, as well as the Qlogic ISP 2100
+# FC/AL Host Adapter.
+#
 # The `amd' device provides support for the Tekram DC-390 and 390T
 # SCSI host adapters, but is expected to work with any AMD 53c974
 # PCI SCSI chip and the AMD Ethernet+SCSI Combo chip, after some
@@ -1340,6 +1344,7 @@ options	"EISA_SLOTS=12"
 controller	pci0
 controller	ahc1
 controller	ncr0
+controller	isp0
 controller	amd0
 device		de0
 device		fxp0
diff --git a/sys/i386/conf/SMP-GENERIC b/sys/i386/conf/SMP-GENERIC
index 6f5c927..cc76b01 100644
--- a/sys/i386/conf/SMP-GENERIC
+++ b/sys/i386/conf/SMP-GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: SMP-GENERIC,v 1.9 1997/10/28 07:24:35 joerg Exp $
+#	$Id: SMP-GENERIC,v 1.10 1997/10/31 22:10:02 jseger Exp $
 
 machine		"i386"
 # SMP does NOT support 386/486 CPUs.
@@ -83,6 +83,7 @@ controller	ncr0
 controller	amd0
 controller	ahb0
 controller	ahc0
+controller	isp0
 
 controller	bt0	at isa? port "IO_BT0" bio irq ? vector bt_isa_intr
 controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr