diff options
| author | marius <marius@FreeBSD.org> | 2004-04-30 15:00:41 +0000 |
|---|---|---|
| committer | marius <marius@FreeBSD.org> | 2004-04-30 15:00:41 +0000 |
| commit | 943e678096816fc1353d9a679017d4a87c4a7ec7 (patch) | |
| tree | 27d7d677f8c608574418c41de1395c36bb042d40 | |
| parent | 9d8662aa9242e2ed276c3d2538cfc9aa209cc861 (diff) | |
| download | FreeBSD-src-943e678096816fc1353d9a679017d4a87c4a7ec7.zip FreeBSD-src-943e678096816fc1353d9a679017d4a87c4a7ec7.tar.gz | |
Remove the separate kernel option for Sun APB PCI-PCI bridges and make
support for them conditional on the pci(4) kernel option instead.
OK'ed by: tmm
| -rw-r--r-- | sys/conf/files.sparc64 | 2 | ||||
| -rw-r--r-- | sys/sparc64/conf/GENERIC | 1 | ||||
| -rw-r--r-- | sys/sparc64/conf/NOTES | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64 index 6670cce..741fc36 100644 --- a/sys/conf/files.sparc64 +++ b/sys/conf/files.sparc64 @@ -52,7 +52,7 @@ sparc64/fhc/fhc_nexus.c optional fhc sparc64/isa/isa.c optional isa sparc64/isa/ofw_isa.c optional ebus sparc64/isa/ofw_isa.c optional isa -sparc64/pci/apb.c optional apb +sparc64/pci/apb.c optional pci sparc64/pci/ofw_pci.c optional pci sparc64/pci/ofw_pcib.c optional pci ofw_newpci sparc64/pci/ofw_pcib_subr.c optional pci ofw_newpci diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC index eacb9a8..4154497 100644 --- a/sys/sparc64/conf/GENERIC +++ b/sys/sparc64/conf/GENERIC @@ -68,7 +68,6 @@ options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed options SMP # Symmetric MultiProcessor Kernel # Standard busses -device apb # Sun APB PCI-PCI bridge device ebus device isa device pci diff --git a/sys/sparc64/conf/NOTES b/sys/sparc64/conf/NOTES index 56c3f13..86f24a0 100644 --- a/sys/sparc64/conf/NOTES +++ b/sys/sparc64/conf/NOTES @@ -24,7 +24,6 @@ cpu SUN4U ##################################################################### # HARDWARE BUS CONFIGURATION -device apb # Sun APB PCI-PCI bridge device ebus device isa device pci |
