From owner-svn-src-all@FreeBSD.ORG Sat Jul 13 07:16:46 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 56DB8733; Sat, 13 Jul 2013 07:16:46 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 486FC1478; Sat, 13 Jul 2013 07:16:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6D7GkI7029096; Sat, 13 Jul 2013 07:16:46 GMT (envelope-from jhibbits@svn.freebsd.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6D7GkAN029095; Sat, 13 Jul 2013 07:16:46 GMT (envelope-from jhibbits@svn.freebsd.org) Message-Id: <201307130716.r6D7GkAN029095@svn.freebsd.org> From: Justin Hibbits Date: Sat, 13 Jul 2013 07:16:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r253315 - head/sys/modules X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Jul 2013 07:16:46 -0000 Author: jhibbits Date: Sat Jul 13 07:16:45 2013 New Revision: 253315 URL: http://svnweb.freebsd.org/changeset/base/253315 Log: Clean up the modules list for PowerPC. powerpc64 has MACHINE_CPUARCH of powerpc. While here, sort the list. Modified: head/sys/modules/Makefile Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Sat Jul 13 04:25:03 2013 (r253314) +++ head/sys/modules/Makefile Sat Jul 13 07:16:45 2013 (r253315) @@ -808,23 +808,24 @@ _cardbus= cardbus _cbb= cbb _cfi= cfi _cpufreq= cpufreq +.if ${MK_CDDL} != "no" || defined(ALL_MODULES) +_cyclic= cyclic +.endif _drm= drm +.if ${MK_CDDL} != "no" || defined(ALL_MODULES) +_dtrace= dtrace +.endif _exca= exca _nvram= powermac_nvram _pccard= pccard _smbfs= smbfs _sound= sound -_cyclic= cyclic -_dtrace= dtrace +.if ${MK_CDDL} != "no" || defined(ALL_MODULES) _opensolaris= opensolaris .endif +.endif .if ${MACHINE_ARCH} == "powerpc64" -.if ${MK_CDDL} != "no" || defined(ALL_MODULES) -_cyclic= cyclic -_dtrace= dtrace -_opensolaris= opensolaris -.endif .if ${MK_ZFS} != "no" || defined(ALL_MODULES) _zfs= zfs .endif