Clean up and sort the RAID sections in our configs.

diff --git a/sys/config/GENERIC b/sys/config/GENERIC
index 49a35db..a164c7e 100644 (file)
--- a/sys/config/GENERIC
+++ b/sys/config/GENERIC
@@ -128,7 +128,6 @@ device              ahb             # EISA AHA1742 family
 device         ahc             # AHA2940 and onboard AIC7xxx devices
 device         ahd             # AHA39320/29320 and onboard AIC79xx devices
 device         amd             # AMD 53C974 (Tekram DC-390(T))
-device         hptiop          # Highpoint RocketRaid 3xxx series
 device         isp             # Qlogic family
 device         mpt             # LSI-Logic MPT/Fusion
 device         ncr             # NCR/Symbios Logic
@@ -156,30 +155,27 @@ device            pass            # Passthrough device (direct SCSI access)
 device         sg              # Passthrough device (linux scsi generic)
 
 # RAID controllers interfaced to the SCSI subsystem
+device         arcmsr          # Areca SATA II RAID
 device         asr             # DPT SmartRAID V, VI and Adaptec SCSI RAID
+device         ciss            # Compaq SmartRAID 5* series
 device         dpt             # DPT Smartcache - See LINT for options!
+device         hptiop          # Highpoint RocketRaid 3xxx series
 device         iir             # Intel Integrated RAID
 device         mly             # Mylex AcceleRAID/eXtremeRAID
-device         ciss            # Compaq SmartRAID 5* series
 
 # RAID controllers
 device         aac             # Adaptec FSA RAID, Dell PERC2/PERC3
 #device                aacp            # SCSI passthrough for aac (requires CAM)
-device         ida             # Compaq Smart RAID
-device         ips             # IBM ServeRAID
 device         amr             # AMI MegaRAID
 device         amrp            # SCSI Passthrough interface (optional, CAM req.)
+device         ida             # Compaq Smart RAID
+device         ips             # IBM ServeRAID
 device         mlx             # Mylex DAC960 family
 device         mfi             # LSI MegaRAID SAS
 device         mfip            # LSI MegaRAID SAS passthrough, requires CAM
-device         twe             # 3ware Escalade 7000/8000's
-device         twa             # 3ware 9000 series PATA/SATA RAID
 device         pst             # Promise Supertrack
-
-#
-# Areca RAID (CAM is required).
-#
-device         arcmsr          # Areca SATA II RAID
+device         twa             # 3ware 9000 series PATA/SATA RAID
+device         twe             # 3ware Escalade 7000/8000's
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
 device         atkbdc0 at isa? port IO_KBD

diff --git a/sys/config/GENERIC_SMP b/sys/config/GENERIC_SMP
index c3cefbc..cd1a721 100644 (file)
--- a/sys/config/GENERIC_SMP
+++ b/sys/config/GENERIC_SMP
@@ -129,7 +129,6 @@ device              ahb             # EISA AHA1742 family
 device         ahc             # AHA2940 and onboard AIC7xxx devices
 device         ahd             # AHA39320/29320 and onboard AIC79xx devices
 device         amd             # AMD 53C974 (Tekram DC-390(T))
-device         hptiop          # Highpoint RocketRaid 3xxx series
 device         isp             # Qlogic family
 device         mpt             # LSI-Logic MPT/Fusion
 device         ncr             # NCR/Symbios Logic
@@ -157,30 +156,27 @@ device            pass            # Passthrough device (direct SCSI access)
 device         sg              # Passthrough device (linux scsi generic)
 
 # RAID controllers interfaced to the SCSI subsystem
+device         arcmsr          # Areca SATA II RAID
 device         asr             # DPT SmartRAID V, VI and Adaptec SCSI RAID
+device         ciss            # Compaq SmartRAID 5* series
 device         dpt             # DPT Smartcache - See LINT for options!
+device         hptiop          # Highpoint RocketRaid 3xxx series
 device         iir             # Intel Integrated RAID
 device         mly             # Mylex AcceleRAID/eXtremeRAID
-device         ciss            # Compaq SmartRAID 5* series
 
 # RAID controllers
 device         aac             # Adaptec FSA RAID, Dell PERC2/PERC3
 #device                aacp            # SCSI passthrough for aac (requires CAM)
-device         ida             # Compaq Smart RAID
-device         ips             # IBM ServeRAID
 device         amr             # AMI MegaRAID
 device         amrp            # SCSI Passthrough interface (optional, CAM req.)
+device         ida             # Compaq Smart RAID
+device         ips             # IBM ServeRAID
 device         mlx             # Mylex DAC960 family
 device         mfi             # LSI MegaRAID SAS
 device         mfip            # LSI MegaRAID SAS passthrough, requires CAM
-device         twe             # 3ware Escalade 7000/8000's
-device         twa             # 3ware 9000 series PATA/SATA RAID
 device         pst             # Promise Supertrack
-
-#
-# Areca RAID (CAM is required).
-#
-device         arcmsr          # Areca SATA II RAID
+device         twa             # 3ware 9000 series PATA/SATA RAID
+device         twe             # 3ware Escalade 7000/8000's
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
 device         atkbdc0 at isa? port IO_KBD

diff --git a/sys/config/X86_64_GENERIC b/sys/config/X86_64_GENERIC
index 93e8d7e..be098b7 100644 (file)
--- a/sys/config/X86_64_GENERIC
+++ b/sys/config/X86_64_GENERIC
@@ -114,7 +114,6 @@ device              ahb             # EISA AHA1742 family
 device         ahc             # AHA2940 and onboard AIC7xxx devices
 device         ahd             # AHA39320/29320 and onboard AIC79xx devices
 device         amd             # AMD 53C974 (Tekram DC-390(T))
-device         hptiop          # Highpoint RocketRaid 3xxx series
 device         isp             # Qlogic family
 device         mpt             # LSI-Logic MPT/Fusion
 device         ncr             # NCR/Symbios Logic
@@ -142,29 +141,26 @@ device            pass            # Passthrough device (direct SCSI access)
 device         sg              # Passthrough device (linux scsi generic)
 
 # RAID controllers interfaced to the SCSI subsystem
+device         arcmsr          # Areca SATA II RAID
 device         asr             # DPT SmartRAID V, VI and Adaptec SCSI RAID
+device         ciss            # Compaq SmartRAID 5* series
 device         dpt             # DPT Smartcache - See LINT for options!
+device         hptiop          # Highpoint RocketRaid 3xxx series
 device         iir             # Intel Integrated RAID
 device         mly             # Mylex AcceleRAID/eXtremeRAID
-device         ciss            # Compaq SmartRAID 5* series
 
 # RAID controllers
 device         aac             # Adaptec FSA RAID, Dell PERC2/PERC3
 #device                aacp            # SCSI passthrough for aac (requires CAM)
-device         ida             # Compaq Smart RAID
-device         ips             # IBM ServeRAID
 device         amr             # AMI MegaRAID
 device         amrp            # SCSI Passthrough interface (optional, CAM req.)
+device         ida             # Compaq Smart RAID
+device         ips             # IBM ServeRAID
 device         mlx             # Mylex DAC960 family
 device         mfi             # LSI MegaRAID SAS
 device         mfip            # LSI MegaRAID SAS passthrough, requires CAM
-device         twe             # 3ware Escalade 7000/8000's
 device         twa             # 3ware 9000 series PATA/SATA RAID
-
-#
-# Areca RAID (CAM is required).
-#
-device         arcmsr          # Areca SATA II RAID
+device         twe             # 3ware Escalade 7000/8000's
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
 device         atkbdc0 at isa? port IO_KBD

diff --git a/sys/config/X86_64_GENERIC_SMP b/sys/config/X86_64_GENERIC_SMP
index 0676c29..c8905fa 100644 (file)
--- a/sys/config/X86_64_GENERIC_SMP
+++ b/sys/config/X86_64_GENERIC_SMP
@@ -114,7 +114,6 @@ device              ahb             # EISA AHA1742 family
 device         ahc             # AHA2940 and onboard AIC7xxx devices
 device         ahd             # AHA39320/29320 and onboard AIC79xx devices
 device         amd             # AMD 53C974 (Tekram DC-390(T))
-device         hptiop          # Highpoint RocketRaid 3xxx series
 device         isp             # Qlogic family
 device         mpt             # LSI-Logic MPT/Fusion
 device         ncr             # NCR/Symbios Logic
@@ -142,29 +141,26 @@ device            pass            # Passthrough device (direct SCSI access)
 device         sg              # Passthrough device (linux scsi generic)
 
 # RAID controllers interfaced to the SCSI subsystem
+device         arcmsr          # Areca SATA II RAID
 device         asr             # DPT SmartRAID V, VI and Adaptec SCSI RAID
+device         ciss            # Compaq SmartRAID 5* series
 device         dpt             # DPT Smartcache - See LINT for options!
+device         hptiop          # Highpoint RocketRaid 3xxx series
 device         iir             # Intel Integrated RAID
 device         mly             # Mylex AcceleRAID/eXtremeRAID
-device         ciss            # Compaq SmartRAID 5* series
 
 # RAID controllers
 device         aac             # Adaptec FSA RAID, Dell PERC2/PERC3
 #device                aacp            # SCSI passthrough for aac (requires CAM)
-device         ida             # Compaq Smart RAID
-device         ips             # IBM ServeRAID
 device         amr             # AMI MegaRAID
 device         amrp            # SCSI Passthrough interface (optional, CAM req.)
+device         ida             # Compaq Smart RAID
+device         ips             # IBM ServeRAID
 device         mlx             # Mylex DAC960 family
 device         mfi             # LSI MegaRAID SAS
 device         mfip            # LSI MegaRAID SAS passthrough, requires CAM
-device         twe             # 3ware Escalade 7000/8000's
 device         twa             # 3ware 9000 series PATA/SATA RAID
-
-#
-# Areca RAID (CAM is required).
-#
-device         arcmsr          # Areca SATA II RAID
+device         twe             # 3ware Escalade 7000/8000's
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
 device         atkbdc0 at isa? port IO_KBD