From 44130dcae15839adaf6f900ff3032684f6fd7f72 Mon Sep 17 00:00:00 2001 From: obrien Date: Sat, 29 Jul 2000 02:12:44 +0000 Subject: Revert previous commit. Not all RAID controllers are SCSI. --- sys/amd64/conf/GENERIC | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'sys/amd64') 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 -- cgit v1.1