From owner-svn-src-all@FreeBSD.ORG Wed Mar 23 08:27:58 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F775106568E; Wed, 23 Mar 2011 08:27:58 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0D5FF8FC12; Wed, 23 Mar 2011 08:27:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2N8RvO2086419; Wed, 23 Mar 2011 08:27:57 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2N8RvDd086417; Wed, 23 Mar 2011 08:27:57 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201103230827.p2N8RvDd086417@svn.freebsd.org> From: Jeff Roberson Date: Wed, 23 Mar 2011 08:27:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219898 - head/sys/modules X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Wed, 23 Mar 2011 08:27:58 -0000 Author: jeff Date: Wed Mar 23 08:27:57 2011 New Revision: 219898 URL: http://svn.freebsd.org/changeset/base/219898 Log: - Move ofed modules into the i386 and amd64 specific sections to fix universe on other architectures. Modified: head/sys/modules/Makefile Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Wed Mar 23 06:31:45 2011 (r219897) +++ head/sys/modules/Makefile Wed Mar 23 08:27:57 2011 (r219898) @@ -418,6 +418,12 @@ _linprocfs= linprocfs _linsysfs= linsysfs _linux= linux _mse= mse +.if ${MK_OFED} != "no" || defined(ALL_MODULES) +_mlx4= mlx4 +_mlx4ib= mlx4ib +_mlxen= mlxen +_mthca= mthca +.endif .if ${MK_NCP} != "no" _ncp= ncp .endif @@ -566,6 +572,12 @@ _linprocfs= linprocfs _linsysfs= linsysfs _linux= linux _mly= mly +.if ${MK_OFED} != "no" || defined(ALL_MODULES) +_mlx4= mlx4 +_mlx4ib= mlx4ib +_mlxen= mlxen +_mthca= mthca +.endif _ndis= ndis _nfe= nfe _nve= nve @@ -673,13 +685,6 @@ _zfs= zfs .endif .endif -.if ${MK_OFED} != "no" || defined(ALL_MODULES) -_mthca= mthca -_mlx4= mlx4 -_mlx4ib= mlx4ib -_mlxen= mlxen -.endif - .if defined(MODULES_OVERRIDE) && !defined(ALL_MODULES) SUBDIR=${MODULES_OVERRIDE} .endif @@ -697,6 +702,5 @@ afterinstall: kldxref ${DESTDIR}${KMODDIR}; \ fi .endif -#endif .include