From owner-svn-src-all@FreeBSD.ORG  Sun Apr 25 19:18:26 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 B3E1F106564A;
	Sun, 25 Apr 2010 19:18:26 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A2E738FC0C;
	Sun, 25 Apr 2010 19:18:26 +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 o3PJIQ7k046076;
	Sun, 25 Apr 2010 19:18:26 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3PJIQx0046074;
	Sun, 25 Apr 2010 19:18:26 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201004251918.o3PJIQx0046074@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 25 Apr 2010 19:18:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207199 - stable/7/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 &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Apr 2010 19:18:26 -0000

Author: imp
Date: Sun Apr 25 19:18:26 2010
New Revision: 207199
URL: http://svn.freebsd.org/changeset/base/207199

Log:
  Merge the ARM module building stuff from current (not done as a merge on
  the makefile becuase there's too many conflicts).

Modified:
  stable/7/sys/modules/Makefile

Modified: stable/7/sys/modules/Makefile
==============================================================================
--- stable/7/sys/modules/Makefile	Sun Apr 25 19:13:08 2010	(r207198)
+++ stable/7/sys/modules/Makefile	Sun Apr 25 19:18:26 2010	(r207199)
@@ -36,7 +36,7 @@ SUBDIR=	${_3dfx} \
 	${_auxio} \
 	${_awi} \
 	axe \
-	bce \
+	${_bce} \
 	bfe \
 	bge \
 	${_bios} \
@@ -68,7 +68,7 @@ SUBDIR=	${_3dfx} \
 	${_cs} \
 	${_ctau} \
 	cue \
-	cxgb \
+	${_cxgb} \
 	${_cx} \
 	${_cyclic} \
 	dc \
@@ -269,7 +269,7 @@ SUBDIR=	${_3dfx} \
 	${_stg} \
 	stge \
 	${_streams} \
-	sym \
+	${_sym} \
 	${_syscons} \
 	sysvipc \
 	ti \
@@ -282,7 +282,7 @@ SUBDIR=	${_3dfx} \
 	txp \
 	u3g \
 	uark \
-	uart \
+	${_uart} \
 	ubsa \
 	ubsec \
 	ubser \
@@ -341,11 +341,18 @@ SUBDIR=	${_3dfx} \
 	zlib \
 	zyd
 
-.if ${MACHINE_ARCH} != "powerpc"
+.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "arm"
 _syscons=	syscons
 _vpo=		vpo
 .endif
 
+.if ${MACHINE_ARCH} != "arm"
+_bce=		bce
+_cxgb=		cxgb
+_sym=		sym
+_uart=		uart
+.endif
+
 .if defined(ALL_MODULES)
 _ufs=		ufs
 .endif