From c79ef5d3318b59d6a0876a95e2a4041cda340948 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Sat, 29 Jul 2000 02:00:28 +0000 Subject: [PATCH] Move the RAID controllers next to the SCSI controllers. --- sys/amd64/conf/GENERIC | 11 ++++++----- 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 500cccb4fefa..c4311afa54ca 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 500cccb4fefa..c4311afa54ca 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