diff options
author | trasz <trasz@FreeBSD.org> | 2013-04-12 16:25:03 +0000 |
---|---|---|
committer | trasz <trasz@FreeBSD.org> | 2013-04-12 16:25:03 +0000 |
commit | 80b8b2f7791585982400714f802d5617862e9c68 (patch) | |
tree | 0d3f89904a66a862c8883241e7d39bebcff52fcc /sys/i386 | |
parent | 06443169d2a0b4fd8cfe68856c1285347f5e59b0 (diff) | |
download | FreeBSD-src-80b8b2f7791585982400714f802d5617862e9c68.zip FreeBSD-src-80b8b2f7791585982400714f802d5617862e9c68.tar.gz |
Remove ctl(4) from GENERIC. Also remove 'options CTL_DISABLE'
and kern.cam.ctl.disable tunable; those were introduced as a workaround
to make it possible to boot GENERIC on low memory machines.
With ctl(4) being built as a module and automatically loaded by ctladm(8),
this makes CTL work out of the box.
Reviewed by: ken
Sponsored by: FreeBSD Foundation
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/conf/GENERIC | 5 | ||||
-rw-r--r-- | sys/i386/conf/PAE | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 5f10405..be606ec 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -145,10 +145,7 @@ device sa # Sequential Access (tape etc) device cd # CD device pass # Passthrough device (direct ATA/SCSI access) device ses # Enclosure Services (SES and SAF-TE) -device ctl # CAM Target Layer -options CTL_DISABLE # Disable CTL by default to save memory. - # Re-enable with kern.cam.ctl.disable=0 in - # /boot/loader.conf +#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 5600d08..254dc08 100644 --- a/sys/i386/conf/PAE +++ b/sys/i386/conf/PAE @@ -38,8 +38,6 @@ nodevice ncv nodevice nsp nodevice stg -nodevice ctl - nodevice asr nodevice dpt nodevice mly |