diff options
author | David E. O'Brien <obrien@FreeBSD.org> | 2000-07-29 02:12:44 +0000 |
---|---|---|
committer | David E. O'Brien <obrien@FreeBSD.org> | 2000-07-29 02:12:44 +0000 |
commit | ff6804717c07d2e42233932063b137f8d8a5e364 (patch) | |
tree | 095a02040eb4e00c789cb8918265c2b820d44be1 /sys/i386/conf/GENERIC | |
parent | c79ef5d3318b59d6a0876a95e2a4041cda340948 (diff) | |
download | src-ff6804717c07d2e42233932063b137f8d8a5e364.tar.gz src-ff6804717c07d2e42233932063b137f8d8a5e364.zip |
Revert previous commit. Not all RAID controllers are SCSI.
Notes
Notes:
svn path=/head/; revision=63994
Diffstat (limited to 'sys/i386/conf/GENERIC')
-rw-r--r-- | sys/i386/conf/GENERIC | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index c4311afa54ca..500cccb4fefa 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -99,12 +99,6 @@ device bt device aha 1 device aic -# RAID controllers -device ida # Compaq Smart RAID -device amr # AMI MegaRAID -device mlx # Mylex DAC960 family - - # SCSI peripherals device scbus # SCSI bus (required) device da # Direct Access (disks) @@ -112,6 +106,11 @@ device sa # Sequential Access (tape etc) device cd # CD device pass # Passthrough device (direct SCSI access) +# RAID controllers +device ida # Compaq Smart RAID +device amr # AMI MegaRAID +device mlx # Mylex DAC960 family + # atkbdc0 controls both the keyboard and the PS/2 mouse device atkbdc 1 device atkbd |