summaryrefslogtreecommitdiff
path: root/sys/i386
diff options
context:
space:
mode:
authorKenneth D. Merry <ken@FreeBSD.org>2012-01-12 00:34:33 +0000
committerKenneth D. Merry <ken@FreeBSD.org>2012-01-12 00:34:33 +0000
commit130f4520cba830cc6da47c9f871fed78710a4709 (patch)
tree7946584ac02844d69b801e04e75ab025509c33de /sys/i386
parentec3fc72f94b64840ffc88b4c376437ca7ee43fda (diff)
Notes
Diffstat (limited to 'sys/i386')
-rw-r--r--sys/i386/conf/GENERIC3
-rw-r--r--sys/i386/conf/PAE3
2 files changed, 5 insertions, 1 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 569b9e1285ac8..f636c7a5854c6 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -138,7 +138,8 @@ device da # Direct Access (disks)
device sa # Sequential Access (tape etc)
device cd # CD
device pass # Passthrough device (direct ATA/SCSI access)
-device ses # SCSI Environmental Services (and SAF-TE)
+device ses # Enclosure Services (SES and SAF-TE)
+device ctl # CAM Target Layer
# RAID controllers interfaced to the SCSI subsystem
device amr # AMI MegaRAID
diff --git a/sys/i386/conf/PAE b/sys/i386/conf/PAE
index 613b7d78bacef..ebf010e95f4a6 100644
--- a/sys/i386/conf/PAE
+++ b/sys/i386/conf/PAE
@@ -23,6 +23,7 @@ device ispfw
# address properly may cause data corruption when used in a machine with more
# than 4 gigabytes of memory.
+
nodevice ahb
nodevice sym
nodevice trm
@@ -37,6 +38,8 @@ nodevice ncv
nodevice nsp
nodevice stg
+nodevice ctl
+
nodevice asr
nodevice dpt
nodevice mly