From owner-svn-src-stable@FreeBSD.ORG  Wed Jul 31 11:36:21 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 4A7699C7;
 Wed, 31 Jul 2013 11:36:21 +0000 (UTC)
 (envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 35CD32C8F;
 Wed, 31 Jul 2013 11:36:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6VBaKdo032742;
 Wed, 31 Jul 2013 11:36:20 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6VBaKdC032740;
 Wed, 31 Jul 2013 11:36:20 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201307311136.r6VBaKdC032740@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Wed, 31 Jul 2013 11:36:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r253836 - in stable/9/sys: i386/conf modules
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 31 Jul 2013 11:36:21 -0000

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} \