summaryrefslogtreecommitdiffstats
path: root/sys/pc98
diff options
context:
space:
mode:
authornyan <nyan@FreeBSD.org>1999-12-02 14:00:28 +0000
committernyan <nyan@FreeBSD.org>1999-12-02 14:00:28 +0000
commit8eb4b40d9810bf1d1558ba7b2a3628b11e0cac59 (patch)
tree8c23236b69b445f617e4d3f6c5ed3a478f85fb79 /sys/pc98
parent945cd94ac24919bf60e7628fdf57e6a1fb71d075 (diff)
downloadFreeBSD-src-8eb4b40d9810bf1d1558ba7b2a3628b11e0cac59.zip
FreeBSD-src-8eb4b40d9810bf1d1558ba7b2a3628b11e0cac59.tar.gz
Sync with sys/i386/conf/GENERIC revision up to 1.207.
Diffstat (limited to 'sys/pc98')
-rw-r--r--sys/pc98/conf/GENERIC6
-rw-r--r--sys/pc98/conf/GENERIC986
2 files changed, 10 insertions, 2 deletions
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 61b39b8..f3afff0 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -124,6 +124,10 @@ device sa0 # Sequential Access (tape etc)
device cd0 # CD
device pass0 # Passthrough device (direct SCSI access)
+# RAID controllers
+device amr0 # AMI MegaRAID
+device mlx0 # Mylex DAC960 family
+
# Proprietary or custom CD-ROM Interfaces
device matcd0 at isa? port?
@@ -143,7 +147,7 @@ device sc0 at isa?
device npx0 at nexus? port IO_NPX irq 8
# Power management support (see LINT for more options)
-device apm0 at nexus? disable flags 0x31 # Advanced Power Management
+device apm0 at nexus? disable flags 0x20 # Advanced Power Management
# PCCARD (PCMCIA) support
#controller card0
diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98
index 61b39b8..f3afff0 100644
--- a/sys/pc98/conf/GENERIC98
+++ b/sys/pc98/conf/GENERIC98
@@ -124,6 +124,10 @@ device sa0 # Sequential Access (tape etc)
device cd0 # CD
device pass0 # Passthrough device (direct SCSI access)
+# RAID controllers
+device amr0 # AMI MegaRAID
+device mlx0 # Mylex DAC960 family
+
# Proprietary or custom CD-ROM Interfaces
device matcd0 at isa? port?
@@ -143,7 +147,7 @@ device sc0 at isa?
device npx0 at nexus? port IO_NPX irq 8
# Power management support (see LINT for more options)
-device apm0 at nexus? disable flags 0x31 # Advanced Power Management
+device apm0 at nexus? disable flags 0x20 # Advanced Power Management
# PCCARD (PCMCIA) support
#controller card0
OpenPOWER on IntegriCloud