From 80b8b2f7791585982400714f802d5617862e9c68 Mon Sep 17 00:00:00 2001 From: trasz Date: Fri, 12 Apr 2013 16:25:03 +0000 Subject: 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 --- sys/sparc64/conf/GENERIC | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'sys/sparc64') diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC index 818394e..ad8f429 100644 --- a/sys/sparc64/conf/GENERIC +++ b/sys/sparc64/conf/GENERIC @@ -120,10 +120,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 #device amr # AMI MegaRAID -- cgit v1.1