From cf78bed4d54174d40fa2a7e1af30354946f27385 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Wed, 8 Dec 2010 03:35:57 +0100 Subject: [PATCH] Clean up and sort the RAID sections in our configs. --- sys/config/GENERIC | 18 +++++++----------- sys/config/GENERIC_SMP | 18 +++++++----------- sys/config/X86_64_GENERIC | 16 ++++++---------- sys/config/X86_64_GENERIC_SMP | 16 ++++++---------- 4 files changed, 26 insertions(+), 42 deletions(-) diff --git a/sys/config/GENERIC b/sys/config/GENERIC index 49a35db684..a164c7e2cb 100644 --- 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 c3cefbc4ec..cd1a721c1b 100644 --- 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 93e8d7e747..be098b717b 100644 --- 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 0676c29a10..c8905fa27e 100644 --- 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 -- 2.41.0