From owner-svn-src-all@FreeBSD.ORG  Fri May 23 06:28:31 2014
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: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 ESMTPS id A188E22F;
 Fri, 23 May 2014 06:28:31 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8DFCE271D;
 Fri, 23 May 2014 06:28:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4N6SV7O050967;
 Fri, 23 May 2014 06:28:31 GMT
 (envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4N6SVUq050966;
 Fri, 23 May 2014 06:28:31 GMT
 (envelope-from hselasky@svn.freebsd.org)
Message-Id: <201405230628.s4N6SVUq050966@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Fri, 23 May 2014 06:28:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r266576 - stable/10/sys/modules/sound/sound
X-SVN-Group: stable-10
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.18
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/options/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: Fri, 23 May 2014 06:28:31 -0000

Author: hselasky
Date: Fri May 23 06:28:31 2014
New Revision: 266576
URL: http://svnweb.freebsd.org/changeset/base/266576

Log:
  MFC r265359 and r265780:
  Remove ISA load dependency for the kernel sound
  driver module for ARM and MIPS.

Modified:
  stable/10/sys/modules/sound/sound/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/modules/sound/sound/Makefile
==============================================================================
--- stable/10/sys/modules/sound/sound/Makefile	Fri May 23 06:20:25 2014	(r266575)
+++ stable/10/sys/modules/sound/sound/Makefile	Fri May 23 06:28:31 2014	(r266576)
@@ -44,7 +44,8 @@ CLEANFILES+=	feeder_eq_gen.h feeder_rate
 
 EXPORT_SYMS=	YES	# XXX evaluate
 
-.if ${MACHINE_CPUARCH} == "sparc64" || ${MACHINE_CPUARCH} == "powerpc"
+.if ${MACHINE_CPUARCH} != "i386" && ${MACHINE_CPUARCH} != "amd64" && \
+    ${MACHINE_CPUARCH} != "ia64" && ${MACHINE_CPUARCH} != "pc98"
 # 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.