svn commit: r253836 - in stable/9/sys: i386/conf modules

[Marius Strobl]

Author: marius
Date: Wed Jul 31 11:36:20 2013
New Revision: 253836
URL: http://svnweb.freebsd.org/changeset/base/253836

Log:
  Revert r249530 and re-enable compilation of ctl.ko for all configurations
  except i386 XEN, for which it still doesn't build so far.
  This is a direct commit to stable/9.
  
  Approved by:	re (delphij, kib)

Modified:
  stable/9/sys/i386/conf/XEN
  stable/9/sys/modules/Makefile

Modified: stable/9/sys/i386/conf/XEN
==============================================================================
--- stable/9/sys/i386/conf/XEN	Wed Jul 31 10:54:24 2013	(r253835)
+++ stable/9/sys/i386/conf/XEN	Wed Jul 31 11:36:20 2013	(r253836)
@@ -7,7 +7,7 @@ cpu		I686_CPU
 ident		XEN
 
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-makeoptions	WITHOUT_MODULES="aha ahb amd cxgb dpt drm drm2 hptnr hptmv ida malo mps mwl nve rdma sound sym trm xfs"
+makeoptions	WITHOUT_MODULES="aha ahb amd ctl cxgb dpt drm drm2 hptnr hptmv ida malo mps mwl nve rdma sound sym trm xfs"
 
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption

Modified: stable/9/sys/modules/Makefile
==============================================================================
--- stable/9/sys/modules/Makefile	Wed Jul 31 10:54:24 2013	(r253835)
+++ stable/9/sys/modules/Makefile	Wed Jul 31 11:36:20 2013	(r253836)
@@ -76,6 +76,7 @@ SUBDIR=	\
 	${_cryptodev} \
 	${_cs} \
 	${_ctau} \
+	ctl \
 	${_cxgb} \
 	cxgbe \
 	${_cyclic} \