From b618108fff60254dbe55724cc91d22eef1e17508 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Tue, 23 Jul 2002 06:38:47 +0000 Subject: [PATCH] de-count pci --- sys/amd64/conf/GENERIC | 2 +- sys/i386/conf/GENERIC | 2 +- sys/i386/conf/NEWCARD | 2 +- sys/i386/conf/NOTES | 2 +- sys/i386/conf/OLDCARD | 2 +- sys/ia64/conf/GENERIC | 2 +- sys/pc98/conf/GENERIC | 2 +- sys/powerpc/conf/GENERIC | 2 +- sys/sparc64/conf/GENERIC | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 560b52e10a68..b7ba78009bf9 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -67,7 +67,7 @@ options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed device isa device eisa -device pci 1 # Unit count is for ahc/ahd +device pci #options PCI_ENABLE_IO_MODES # Enable pci resources left off by a "lazy BIOS" # Floppy drives diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 560b52e10a68..b7ba78009bf9 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -67,7 +67,7 @@ options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed device isa device eisa -device pci 1 # Unit count is for ahc/ahd +device pci #options PCI_ENABLE_IO_MODES # Enable pci resources left off by a "lazy BIOS" # Floppy drives diff --git a/sys/i386/conf/NEWCARD b/sys/i386/conf/NEWCARD index 84bd83c43be4..a6aba3d99dad 100644 --- a/sys/i386/conf/NEWCARD +++ b/sys/i386/conf/NEWCARD @@ -69,7 +69,7 @@ options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed device isa device eisa -device pci 1 # Unit count is for ahc/ahd +device pci #options PCI_ENABLE_IO_MODES # Enable pci resources left off by a "lazy BIOS" # Floppy drives diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 592aa4f589ec..f2482be1fef6 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -301,7 +301,7 @@ device mca # # PCI bus & PCI options: # -device pci 1 # unit count is for ahc/ahd +device pci # # AGP GART support diff --git a/sys/i386/conf/OLDCARD b/sys/i386/conf/OLDCARD index 0c8b9af70ab1..d511b074c1d0 100644 --- a/sys/i386/conf/OLDCARD +++ b/sys/i386/conf/OLDCARD @@ -66,7 +66,7 @@ options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed device isa device eisa -device pci 1 # Unit count is for ahc/ahd +device pci #options PCI_ENABLE_IO_MODES # Enable pci resources left off by a "lazy BIOS" # Floppy drives diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC index 0c7060526950..4773c53bc5ef 100644 --- a/sys/ia64/conf/GENERIC +++ b/sys/ia64/conf/GENERIC @@ -65,7 +65,7 @@ options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required # Standard busses device isa -device pci 1 #Unit count is for ahc/ahd +device pci # IA64 uses ACPI device acpica diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index a583b927a182..a6b4d75e2e12 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -72,7 +72,7 @@ options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed #options APIC_IO # Symmetric (APIC) I/O device isa -device pci 1 # Unit count is for ahc/ahd +device pci options COMPAT_OLDISA # Old ISA driver shims #options PCI_ENABLE_IO_MODES # Enable pci resources left off by a "lazy BIOS" diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index cadfabdf8fa9..6257f2d84ba8 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -44,7 +44,7 @@ options WITNESS options POWERMAC -device pci 1 #Unit count is for ahc/ahd +device pci device loop device ether device miibus diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC index 9dd93bcd1d61..e4e26f69bf8c 100644 --- a/sys/sparc64/conf/GENERIC +++ b/sys/sparc64/conf/GENERIC @@ -69,7 +69,7 @@ options SMP # Symmetric MultiProcessor Kernel device apb # Sun APB PCI-PCI bridge device ebus device isa -device pci 1 # Unit count is for ahc/ahd +device pci device sbus # Floppy drives