diff options
| author | peter <peter@FreeBSD.org> | 2003-11-08 03:17:36 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2003-11-08 03:17:36 +0000 |
| commit | e3ffb41b6497177e80f26d5ba8742fa1e7f45201 (patch) | |
| tree | e1a7bc80d3957839e8f26871b2c19994c9994676 /sys/amd64/conf | |
| parent | 43f8154f9787e63e2fc80a09c09544ede4e948f3 (diff) | |
| download | FreeBSD-src-e3ffb41b6497177e80f26d5ba8742fa1e7f45201.zip FreeBSD-src-e3ffb41b6497177e80f26d5ba8742fa1e7f45201.tar.gz | |
Converge with i386/GENERIC
Diffstat (limited to 'sys/amd64/conf')
| -rw-r--r-- | sys/amd64/conf/GENERIC | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 97e7807..234cefe 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -64,12 +64,14 @@ options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required options WITNESS #Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed +device acpi device isa device pci -device acpi -options ACPI_DEBUG +# Sound (no modules) +device pcm + # Floppy drives device fdc @@ -100,15 +102,9 @@ device aha # Adaptec 154x SCSI adapters device aic # Adaptec 15[012]x SCSI adapters, AIC-6[23]60. device bt # Buslogic/Mylex MultiMaster SCSI adapters -# RAID controllers interfaced to the SCSI subsystem -device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID -device ciss # Compaq Smart RAID 5* -device dpt # DPT Smartcache III, IV - See NOTES for options! -device iir # Intel Integrated RAID -device mly # Mylex AcceleRAID/eXtremeRAID # SCSI peripherals -device scbus # SCSI bus (required) +device scbus # SCSI bus (required for SCSI) device ch # SCSI media changers device da # Direct Access (disks) device sa # Sequential Access (tape etc) @@ -116,13 +112,19 @@ device cd # CD device pass # Passthrough device (direct SCSI access) device ses # SCSI Environmental Services (and SAF-TE) +# RAID controllers interfaced to the SCSI subsystem +device amr # AMI MegaRAID +device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID +device ciss # Compaq Smart RAID 5* +device dpt # DPT Smartcache III, IV - See NOTES for options +device iir # Intel Integrated RAID +device ips # IBM (Adaptec) ServeRAID +device mly # Mylex AcceleRAID/eXtremeRAID + # RAID controllers -#XXX pointer/int warnings device aac # Adaptec FSA RAID device aacp # SCSI passthrough for aac (requires CAM) -device amr # AMI MegaRAID device ida # Compaq Smart RAID -device ips # IBM (Adaptec) ServeRAID device mlx # Mylex DAC960 family #XXX pointer/int warnings #device pst # Promise Supertrak SX6000 @@ -172,6 +174,7 @@ device vx # 3Com 3c590, 3c595 (``Vortex'') # PCI Ethernet NICs that use the common MII bus controller code. # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! device miibus # MII bus support +device bfe # Broadcom BCM440x 10/100 ethernet device bge # Broadcom BCM570xx Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) @@ -253,5 +256,3 @@ device kue # Kawasaki LSI USB ethernet device firewire # FireWire bus code device sbp # SCSI over FireWire (Requires scbus and da) device fwe # Ethernet over FireWire (non-standard!) - -device pcm # Sound |
