From owner-svn-src-projects@FreeBSD.ORG  Wed Apr  7 15:09:36 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7C622106564A;
	Wed,  7 Apr 2010 15:09:36 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 469478FC23;
	Wed,  7 Apr 2010 15:09:36 +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 o37F9aAk031127;
	Wed, 7 Apr 2010 15:09:36 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o37F9aPh031125;
	Wed, 7 Apr 2010 15:09:36 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201004071509.o37F9aPh031125@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Wed, 7 Apr 2010 15:09:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206356 - projects/ppc64/sys/modules
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Apr 2010 15:09:36 -0000

Author: nwhitehorn
Date: Wed Apr  7 15:09:35 2010
New Revision: 206356
URL: http://svn.freebsd.org/changeset/base/206356

Log:
  Fix a mismerge in the modules Makefile.
  
  Submitted by:	Justin Hibbits

Modified:
  projects/ppc64/sys/modules/Makefile

Modified: projects/ppc64/sys/modules/Makefile
==============================================================================
--- projects/ppc64/sys/modules/Makefile	Wed Apr  7 14:59:07 2010	(r206355)
+++ projects/ppc64/sys/modules/Makefile	Wed Apr  7 15:09:35 2010	(r206356)
@@ -314,7 +314,7 @@ SUBDIR=	${_3dfx} \
 	zlib \
 
 .if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "powerpc64" && \
-	&& ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips"
+	${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "mips"
 _syscons=	syscons
 _vpo=		vpo
 .endif