diff options
author | obrien <obrien@FreeBSD.org> | 2000-07-29 02:00:28 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2000-07-29 02:00:28 +0000 |
commit | 0c8f766fe2b3657161b9725f8a302f378e1d0bac (patch) | |
tree | 1a4dd07cf18d4215b78c9327fa3d4187a7d54ad5 /sys | |
parent | 7d8d00c3047a02b73da59dbc9a3be797f0c95dd1 (diff) | |
download | FreeBSD-src-0c8f766fe2b3657161b9725f8a302f378e1d0bac.zip FreeBSD-src-0c8f766fe2b3657161b9725f8a302f378e1d0bac.tar.gz |
Move the RAID controllers next to the SCSI controllers.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/amd64/conf/GENERIC | 11 | ||||
-rw-r--r-- | sys/i386/conf/GENERIC | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 500cccb..c4311af 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -99,6 +99,12 @@ 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) @@ -106,11 +112,6 @@ 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 500cccb..c4311af 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -99,6 +99,12 @@ 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) @@ -106,11 +112,6 @@ 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 |