From owner-svn-src-all@FreeBSD.ORG  Mon Sep 13 02:05:42 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 8D8CA1065675;
	Mon, 13 Sep 2010 02:05:42 +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 7CD058FC1B;
	Mon, 13 Sep 2010 02:05:42 +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 o8D25gRj047233;
	Mon, 13 Sep 2010 02:05:42 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8D25gaM047230;
	Mon, 13 Sep 2010 02:05:42 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201009130205.o8D25gaM047230@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 13 Sep 2010 02:05:42 +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: r212523 - in head/sys/modules: scc sound/sound
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: Mon, 13 Sep 2010 02:05:42 -0000

Author: imp
Date: Mon Sep 13 02:05:42 2010
New Revision: 212523
URL: http://svn.freebsd.org/changeset/base/212523

Log:
  MFtbemd: use MACHINE_CPUARCH

Modified:
  head/sys/modules/scc/Makefile
  head/sys/modules/sound/sound/Makefile

Modified: head/sys/modules/scc/Makefile
==============================================================================
--- head/sys/modules/scc/Makefile	Mon Sep 13 02:04:02 2010	(r212522)
+++ head/sys/modules/scc/Makefile	Mon Sep 13 02:05:42 2010	(r212523)
@@ -5,7 +5,7 @@
 .if ${MACHINE} == "sparc64"
 scc_bfe= scc_bfe_ebus.c scc_bfe_sbus.c
 .endif
-.if ${MACHINE_ARCH} == "powerpc"
+.if ${MACHINE_CPUARCH} == "powerpc"
 scc_bfe= scc_bfe_macio.c scc_bfe_quicc.c
 .endif
 

Modified: head/sys/modules/sound/sound/Makefile
==============================================================================
--- head/sys/modules/sound/sound/Makefile	Mon Sep 13 02:04:02 2010	(r212522)
+++ head/sys/modules/sound/sound/Makefile	Mon Sep 13 02:05:42 2010	(r212523)
@@ -44,7 +44,7 @@ CLEANFILES+=	feeder_eq_gen.h feeder_rate
 
 EXPORT_SYMS=	YES	# XXX evaluate
 
-.if ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "powerpc"
+.if ${MACHINE_CPUARCH} == "sparc64" || ${MACHINE_CPUARCH} == "powerpc"
 # Create an empty opt_isa.h in order to keep kmod.mk from linking in an
 # existing one from KERNBUILDDIR which possibly has DEV_ISA defined so
 # sound.ko is always built without isadma support.