summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2000-07-29 02:12:44 +0000
committerobrien <obrien@FreeBSD.org>2000-07-29 02:12:44 +0000
commit44130dcae15839adaf6f900ff3032684f6fd7f72 (patch)
tree620109caf8be642c8a0b716639cddea4c81c6f8c /sys/amd64
parent0c8f766fe2b3657161b9725f8a302f378e1d0bac (diff)
downloadFreeBSD-src-44130dcae15839adaf6f900ff3032684f6fd7f72.zip
FreeBSD-src-44130dcae15839adaf6f900ff3032684f6fd7f72.tar.gz
Revert previous commit. Not all RAID controllers are SCSI.
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/conf/GENERIC11
1 files changed, 5 insertions, 6 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
OpenPOWER on IntegriCloud