summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/amd64/conf/GENERIC1
-rw-r--r--sys/conf/NOTES15
-rw-r--r--sys/i386/conf/GENERIC1
-rw-r--r--sys/i386/conf/LINT15
-rw-r--r--sys/i386/conf/NOTES15
5 files changed, 14 insertions, 33 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 3967448..38bf15a 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -105,6 +105,7 @@ 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
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 0bef4ec..9f12943 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1069,18 +1069,11 @@ device aha0 at isa?
device aic0 at isa?
#
-# Compaq Smart RAID controller. This driver also uses the major number
-# of wd, in order to be able to boot a pure RAID system.
-# Only one line of each is needed, the code finds all available controllers
-# and devices.
-#
-device ida
-device id
-
-#
-# Mylex DAC960, AMI MegaRAID controllers. Only one entry is needed; the code
-# will find and configure all supported controllers.
+# Compaq Smart RAID, Mylex DAC960 and AMI MegaRAID controllers. Only
+# one entry is needed; the code will find and configure all supported
+# controllers.
#
+device ida # Compaq Smart RAID
device mlx # Mylex DAC960
device amr # AMI MegaRAID
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 3967448..38bf15a 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -105,6 +105,7 @@ 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
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 0bef4ec..9f12943 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -1069,18 +1069,11 @@ device aha0 at isa?
device aic0 at isa?
#
-# Compaq Smart RAID controller. This driver also uses the major number
-# of wd, in order to be able to boot a pure RAID system.
-# Only one line of each is needed, the code finds all available controllers
-# and devices.
-#
-device ida
-device id
-
-#
-# Mylex DAC960, AMI MegaRAID controllers. Only one entry is needed; the code
-# will find and configure all supported controllers.
+# Compaq Smart RAID, Mylex DAC960 and AMI MegaRAID controllers. Only
+# one entry is needed; the code will find and configure all supported
+# controllers.
#
+device ida # Compaq Smart RAID
device mlx # Mylex DAC960
device amr # AMI MegaRAID
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 0bef4ec..9f12943 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -1069,18 +1069,11 @@ device aha0 at isa?
device aic0 at isa?
#
-# Compaq Smart RAID controller. This driver also uses the major number
-# of wd, in order to be able to boot a pure RAID system.
-# Only one line of each is needed, the code finds all available controllers
-# and devices.
-#
-device ida
-device id
-
-#
-# Mylex DAC960, AMI MegaRAID controllers. Only one entry is needed; the code
-# will find and configure all supported controllers.
+# Compaq Smart RAID, Mylex DAC960 and AMI MegaRAID controllers. Only
+# one entry is needed; the code will find and configure all supported
+# controllers.
#
+device ida # Compaq Smart RAID
device mlx # Mylex DAC960
device amr # AMI MegaRAID
OpenPOWER on IntegriCloud