summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/alpha/conf/GENERIC8
-rw-r--r--sys/alpha/conf/NOTES8
-rw-r--r--sys/amd64/conf/GENERIC8
-rw-r--r--sys/i386/conf/GENERIC8
4 files changed, 16 insertions, 16 deletions
diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC
index 82b99e4..d82a3da 100644
--- a/sys/alpha/conf/GENERIC
+++ b/sys/alpha/conf/GENERIC
@@ -76,13 +76,13 @@ device atapifd0 # ATAPI floppy drives
device atapist0 # ATAPI tape drives
# SCSI Controllers
-# A single entry for any of these controllers (ncr, ahb, ahc, amd) 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 sym0 # NCR/Symbios Logic (do not mix with ncr, it conflicts)
-controller isp0 # Qlogic family
controller ahc0 # AHA2940 and onboard AIC7xxx devices
#controller esp0
+controller isp0 # Qlogic family
+controller ncr0 # NCR/Symbios Logic
+#controller sym0 # NCR/Symbios Logic (do not mix with ncr, it conflicts)
# SCSI peripherals
# Only one of each of these is needed, they are dynamically allocated.
diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES
index 82b99e4..d82a3da 100644
--- a/sys/alpha/conf/NOTES
+++ b/sys/alpha/conf/NOTES
@@ -76,13 +76,13 @@ device atapifd0 # ATAPI floppy drives
device atapist0 # ATAPI tape drives
# SCSI Controllers
-# A single entry for any of these controllers (ncr, ahb, ahc, amd) 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 sym0 # NCR/Symbios Logic (do not mix with ncr, it conflicts)
-controller isp0 # Qlogic family
controller ahc0 # AHA2940 and onboard AIC7xxx devices
#controller esp0
+controller isp0 # Qlogic family
+controller ncr0 # NCR/Symbios Logic
+#controller sym0 # NCR/Symbios Logic (do not mix with ncr, it conflicts)
# SCSI peripherals
# Only one of each of these is needed, they are dynamically allocated.
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 78077e0..a94dc7d 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -95,15 +95,15 @@ device wst0 #IDE Tape (e.g. Travan)
#options ATA_ENABLE_ATAPI_DMA #Enable DMA on ATAPI devices
# 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 sym0 # NCR/Symbios Logic (do not mix with ncr, it conflicts)
controller ahb0 # EISA AHA1742 family
controller ahc0 # AHA2940 and onboard AIC7xxx devices
controller amd0 # AMD 53C974 (Teckram DC-390(T))
-controller isp0 # Qlogic family
controller dpt0 # DPT Smartcache - See LINT for options!
+controller isp0 # Qlogic family
+controller ncr0 # NCR/Symbios Logic
+#controller sym0 # NCR/Symbios Logic (do not mix with ncr, it conflicts)
controller adv0 at isa? port ? irq ?
controller adw0
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 78077e0..a94dc7d 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -95,15 +95,15 @@ device wst0 #IDE Tape (e.g. Travan)
#options ATA_ENABLE_ATAPI_DMA #Enable DMA on ATAPI devices
# 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 sym0 # NCR/Symbios Logic (do not mix with ncr, it conflicts)
controller ahb0 # EISA AHA1742 family
controller ahc0 # AHA2940 and onboard AIC7xxx devices
controller amd0 # AMD 53C974 (Teckram DC-390(T))
-controller isp0 # Qlogic family
controller dpt0 # DPT Smartcache - See LINT for options!
+controller isp0 # Qlogic family
+controller ncr0 # NCR/Symbios Logic
+#controller sym0 # NCR/Symbios Logic (do not mix with ncr, it conflicts)
controller adv0 at isa? port ? irq ?
controller adw0
OpenPOWER on IntegriCloud