8 files changed, 29 insertions, 29 deletions

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index ee1ac98c5b3a..2a4b8dbb594d 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -1,7 +1,7 @@
 #
 # GENERICAH -- Generic machine with WD/AHx/NCR family disks
 #
-#	$Id: GENERIC,v 1.1 1994/10/17 21:10:19 phk Exp $
+#	$Id: GENERIC,v 1.2 1994/10/20 00:19:34 phk Exp $
 #
 
 machine		"i386"
@@ -42,9 +42,9 @@ disk		wd3	at wdc1 drive 1
 
 controller	ncr0
 
-controller	bt0	at isa? port "IO_BT0" bio irq 12 vector btintr
-controller	ahb0	at isa? bio irq 11 vector ahbintr
-controller	aha0	at isa? port "IO_AHA0" bio irq 11 drq 5 vector ahaintr
+controller	bt0	at isa? port "IO_BT0" bio irq ? vector btintr
+controller	ahb0	at isa? bio irq ? vector ahbintr
+controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
 controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
 controller	aic0    at isa? port 0x340 bio irq 11 vector aicintr
 controller	pas0	at isa? port 0x1f88 bio
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 228f6c196887..5085d538aa49 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.95 1994/10/15 08:09:42 phk Exp $
+#	$Id: LINT,v 1.96 1994/10/20 00:19:36 phk Exp $
 #
 
 machine		"i386"
@@ -137,13 +137,13 @@ controller	pci0
 device		apm0	at isa?
 
 # driver for the Adaptec 154x SCSI cards.
-controller	aha0	at isa? port "IO_AHA0" bio irq 11 drq 5 vector ahaintr
+controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
 # driver for the Adaptec 174x SCSI cards.
-controller	ahb0	at isa? bio irq 11 vector ahbintr
+controller	ahb0	at isa? bio irq ? vector ahbintr
 # Driver for Soundblaster (and PAS?) SCSI controller.
 controller      aic0    at isa? port 0x340 bio irq 11 vector aicintr
 # driver for the Bustek 742.
-controller	bt0	at isa? port "IO_BT0" bio irq 12 vector btintr
+controller	bt0	at isa? port "IO_BT0" bio irq ? vector btintr
 
 controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr
 disk		fd0	at fdc0 drive 0
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index ee1ac98c5b3a..2a4b8dbb594d 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -1,7 +1,7 @@
 #
 # GENERICAH -- Generic machine with WD/AHx/NCR family disks
 #
-#	$Id: GENERIC,v 1.1 1994/10/17 21:10:19 phk Exp $
+#	$Id: GENERIC,v 1.2 1994/10/20 00:19:34 phk Exp $
 #
 
 machine		"i386"
@@ -42,9 +42,9 @@ disk		wd3	at wdc1 drive 1
 
 controller	ncr0
 
-controller	bt0	at isa? port "IO_BT0" bio irq 12 vector btintr
-controller	ahb0	at isa? bio irq 11 vector ahbintr
-controller	aha0	at isa? port "IO_AHA0" bio irq 11 drq 5 vector ahaintr
+controller	bt0	at isa? port "IO_BT0" bio irq ? vector btintr
+controller	ahb0	at isa? bio irq ? vector ahbintr
+controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
 controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
 controller	aic0    at isa? port 0x340 bio irq 11 vector aicintr
 controller	pas0	at isa? port 0x1f88 bio
diff --git a/sys/i386/conf/GENERICAH b/sys/i386/conf/GENERICAH
index a7fdce634a7a..54f4454bff21 100644
--- a/sys/i386/conf/GENERICAH
+++ b/sys/i386/conf/GENERICAH
@@ -1,7 +1,7 @@
 #
 # GENERICAH -- Generic machine with WD/AHx/NCR family disks
 #
-#	$Id: GENERICAH,v 1.51 1994/10/15 08:09:39 phk Exp $
+#	$Id: GENERICAH,v 1.52 1994/10/15 22:19:37 phk Exp $
 #
 
 machine		"i386"
@@ -41,8 +41,8 @@ controller	wdc1	at isa? port "IO_WD2" bio irq 15 vector wdintr
 disk		wd2	at wdc1 drive 0
 disk		wd3	at wdc1 drive 1
 
-controller	ahb0	at isa? bio irq 11 vector ahbintr
-controller	aha0	at isa? port "IO_AHA0" bio irq 11 drq 5 vector ahaintr
+controller	ahb0	at isa? bio irq ? vector ahbintr
+controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
 controller	pas0	at isa? port 0x1f88 bio
 controller	aic0    at isa? port 0x340 bio irq 11 vector aicintr
 controller	pci0
diff --git a/sys/i386/conf/GENERICBT b/sys/i386/conf/GENERICBT
index ce112842d65f..0f0fed4ae528 100644
--- a/sys/i386/conf/GENERICBT
+++ b/sys/i386/conf/GENERICBT
@@ -1,7 +1,7 @@
 #
 # GENERICBT -- Generic machine with WD/BTx family disks
 #
-#	$Id: GENERICBT,v 1.47 1994/10/15 22:19:38 phk Exp $
+#	$Id: GENERICBT,v 1.48 1994/10/20 00:19:35 phk Exp $
 #
 
 machine		"i386"
@@ -41,7 +41,7 @@ controller	wdc1	at isa? port "IO_WD2" bio irq 15 vector wdintr
 disk		wd2	at wdc1 drive 0
 disk		wd3	at wdc1 drive 1
 
-controller	bt0	at isa? port "IO_BT0" bio irq 12 vector btintr
+controller	bt0	at isa? port "IO_BT0" bio irq ? vector btintr
 controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
 controller	scbus0
 
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 228f6c196887..5085d538aa49 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.95 1994/10/15 08:09:42 phk Exp $
+#	$Id: LINT,v 1.96 1994/10/20 00:19:36 phk Exp $
 #
 
 machine		"i386"
@@ -137,13 +137,13 @@ controller	pci0
 device		apm0	at isa?
 
 # driver for the Adaptec 154x SCSI cards.
-controller	aha0	at isa? port "IO_AHA0" bio irq 11 drq 5 vector ahaintr
+controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
 # driver for the Adaptec 174x SCSI cards.
-controller	ahb0	at isa? bio irq 11 vector ahbintr
+controller	ahb0	at isa? bio irq ? vector ahbintr
 # Driver for Soundblaster (and PAS?) SCSI controller.
 controller      aic0    at isa? port 0x340 bio irq 11 vector aicintr
 # driver for the Bustek 742.
-controller	bt0	at isa? port "IO_BT0" bio irq 12 vector btintr
+controller	bt0	at isa? port "IO_BT0" bio irq ? vector btintr
 
 controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr
 disk		fd0	at fdc0 drive 0
diff --git a/sys/i386/conf/MINI b/sys/i386/conf/MINI
index d990eeb6fc45..e038ee50702a 100644
--- a/sys/i386/conf/MINI
+++ b/sys/i386/conf/MINI
@@ -1,7 +1,7 @@
 #
 # MINI -- A kernel to get FreeBSD on onto a disk.
 #
-#	$Id: MINI,v 1.3 1994/10/18 07:21:57 phk Exp $
+#	$Id: MINI,v 1.4 1994/10/20 00:19:37 phk Exp $
 #
 
 machine		"i386"
@@ -37,9 +37,9 @@ disk		wd3	at wdc1 drive 1
 
 controller	ncr0
 
-controller	bt0	at isa? port "IO_BT0" bio irq 12 vector btintr
-controller	ahb0	at isa? bio irq 11 vector ahbintr
-controller	aha0	at isa? port "IO_AHA0" bio irq 11 drq 5 vector ahaintr
+controller	bt0	at isa? port "IO_BT0" bio irq ? vector btintr
+controller	ahb0	at isa? bio irq ? vector ahbintr
+controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
 controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
 controller	aic0    at isa? port 0x340 bio irq 11 vector aicintr
 
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 228f6c196887..5085d538aa49 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.95 1994/10/15 08:09:42 phk Exp $
+#	$Id: LINT,v 1.96 1994/10/20 00:19:36 phk Exp $
 #
 
 machine		"i386"
@@ -137,13 +137,13 @@ controller	pci0
 device		apm0	at isa?
 
 # driver for the Adaptec 154x SCSI cards.
-controller	aha0	at isa? port "IO_AHA0" bio irq 11 drq 5 vector ahaintr
+controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
 # driver for the Adaptec 174x SCSI cards.
-controller	ahb0	at isa? bio irq 11 vector ahbintr
+controller	ahb0	at isa? bio irq ? vector ahbintr
 # Driver for Soundblaster (and PAS?) SCSI controller.
 controller      aic0    at isa? port 0x340 bio irq 11 vector aicintr
 # driver for the Bustek 742.
-controller	bt0	at isa? port "IO_BT0" bio irq 12 vector btintr
+controller	bt0	at isa? port "IO_BT0" bio irq ? vector btintr
 
 controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr
 disk		fd0	at fdc0 drive 0