summaryrefslogtreecommitdiffstats
path: root/sys/pc98
diff options
context:
space:
mode:
authornyan <nyan@FreeBSD.org>1999-11-28 08:55:01 +0000
committernyan <nyan@FreeBSD.org>1999-11-28 08:55:01 +0000
commit35f2e5452d46d5b312a48e39eac34d4299dcb1fe (patch)
tree7458f4dab766a35f6eb1dec47b0e7183aa556392 /sys/pc98
parentd740587cf80bf1274d432dc39c17d9c3dd7c8945 (diff)
downloadFreeBSD-src-35f2e5452d46d5b312a48e39eac34d4299dcb1fe.zip
FreeBSD-src-35f2e5452d46d5b312a48e39eac34d4299dcb1fe.tar.gz
Sync with sys/i386/conf/GENERIC revision 1.205.
Diffstat (limited to 'sys/pc98')
-rw-r--r--sys/pc98/conf/GENERIC7
-rw-r--r--sys/pc98/conf/GENERIC987
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index a757d28..61b39b8 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -88,13 +88,14 @@ device wcd0 #IDE CD-ROM
#device wst0 #IDE Tape (e.g. Travan)
# SCSI Controllers
-# A single entry for any of these controllers (ncr, ahb, ahc) is
+# A single entry for any of these controllers (ahb, ahc, amd, ncr, etc...) is
# sufficient for any number of installed devices.
-controller ncr0 # NCR/Symbios Logic
+controller adv0
controller ahc0 # AHA2940 and onboard AIC7xxx devices
controller amd0 # AMD 53C974 (Teckram DC-390(T))
controller isp0 # Qlogic family
-controller adv0
+controller ncr0 # NCR/Symbios Logic
+#controller sym0 # NCR/Symbios Logic (do not mix with ncr, it conflicts)
#
# WD33C93 SCSI card (55/92 like board)
diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98
index a757d28..61b39b8 100644
--- a/sys/pc98/conf/GENERIC98
+++ b/sys/pc98/conf/GENERIC98
@@ -88,13 +88,14 @@ device wcd0 #IDE CD-ROM
#device wst0 #IDE Tape (e.g. Travan)
# SCSI Controllers
-# A single entry for any of these controllers (ncr, ahb, ahc) is
+# A single entry for any of these controllers (ahb, ahc, amd, ncr, etc...) is
# sufficient for any number of installed devices.
-controller ncr0 # NCR/Symbios Logic
+controller adv0
controller ahc0 # AHA2940 and onboard AIC7xxx devices
controller amd0 # AMD 53C974 (Teckram DC-390(T))
controller isp0 # Qlogic family
-controller adv0
+controller ncr0 # NCR/Symbios Logic
+#controller sym0 # NCR/Symbios Logic (do not mix with ncr, it conflicts)
#
# WD33C93 SCSI card (55/92 like board)
OpenPOWER on IntegriCloud