Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 Apr 2010 15:09:36 +0000 (UTC)
From:      Nathan Whitehorn <nwhitehorn@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r206356 - projects/ppc64/sys/modules
Message-ID:  <201004071509.o37F9aPh031125@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004071509.o37F9aPh031125>