From 658743b5e2fbfae62fcb731f70a26d153cefd7c2 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Sun, 28 Nov 1999 00:48:15 +0000 Subject: [PATCH] /sys adjustments to add the `sym' controler driver. This is commented out in GENERIC as you cannot mix `sym' with `ncr' right now. Note that LINT is no more broken by this commit. --- sys/alpha/conf/GENERIC | 1 + sys/alpha/conf/NOTES | 1 + sys/amd64/conf/GENERIC | 1 + sys/conf/NOTES | 1 + sys/conf/files | 2 ++ sys/i386/conf/GENERIC | 1 + sys/i386/conf/LINT | 1 + sys/i386/conf/NOTES | 1 + 8 files changed, 9 insertions(+) diff --git a/sys/alpha/conf/GENERIC b/sys/alpha/conf/GENERIC index e1525f2a760..82b99e40d6e 100644 --- a/sys/alpha/conf/GENERIC +++ b/sys/alpha/conf/GENERIC @@ -79,6 +79,7 @@ device atapist0 # ATAPI tape drives # A single entry for any of these controllers (ncr, ahb, ahc, amd) 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 diff --git a/sys/alpha/conf/NOTES b/sys/alpha/conf/NOTES index e1525f2a760..82b99e40d6e 100644 --- a/sys/alpha/conf/NOTES +++ b/sys/alpha/conf/NOTES @@ -79,6 +79,7 @@ device atapist0 # ATAPI tape drives # A single entry for any of these controllers (ncr, ahb, ahc, amd) 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 diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 6ebc1c8f959..78077e08d9e 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -98,6 +98,7 @@ device wst0 #IDE Tape (e.g. Travan) # A single entry for any of these controllers (ncr, ahb, ahc) 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)) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index c45ffdab3d0..046e5dc0f27 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1780,6 +1780,7 @@ controller pci0 controller ahc1 controller amd0 controller ncr0 +controller sym0 controller isp0 # # Options for ISP diff --git a/sys/conf/files b/sys/conf/files index 8902d397637..ea7c95d5dcc 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -741,6 +741,8 @@ pci/isp_pci.c optional isp pci/intpm.c optional intpm pci/meteor.c optional meteor pci pci/ncr.c optional ncr +dev/sym/sym_hipd.c optional sym \ + dependency "$S/dev/sym/sym_{conf,defs}.h" pci/pci.c optional pci pci/pci_compat.c optional pci pci/pcisupport.c optional pci diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 6ebc1c8f959..78077e08d9e 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -98,6 +98,7 @@ device wst0 #IDE Tape (e.g. Travan) # A single entry for any of these controllers (ncr, ahb, ahc) 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)) diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index c45ffdab3d0..046e5dc0f27 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -1780,6 +1780,7 @@ controller pci0 controller ahc1 controller amd0 controller ncr0 +controller sym0 controller isp0 # # Options for ISP diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index c45ffdab3d0..046e5dc0f27 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -1780,6 +1780,7 @@ controller pci0 controller ahc1 controller amd0 controller ncr0 +controller sym0 controller isp0 # # Options for ISP