diff options
author | obrien <obrien@FreeBSD.org> | 2000-07-29 02:12:44 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2000-07-29 02:12:44 +0000 |
commit | 44130dcae15839adaf6f900ff3032684f6fd7f72 (patch) | |
tree | 620109caf8be642c8a0b716639cddea4c81c6f8c | |
parent | 0c8f766fe2b3657161b9725f8a302f378e1d0bac (diff) | |
download | FreeBSD-src-44130dcae15839adaf6f900ff3032684f6fd7f72.zip FreeBSD-src-44130dcae15839adaf6f900ff3032684f6fd7f72.tar.gz |
Revert previous commit. Not all RAID controllers are SCSI.
-rw-r--r-- | sys/amd64/conf/GENERIC | 11 | ||||
-rw-r--r-- | sys/i386/conf/GENERIC | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index c4311af..500cccb 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/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 diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index c4311af..500cccb 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 |