From owner-svn-src-stable@FreeBSD.ORG  Fri Jun 29 13:02:46 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CAF5F106566B;
	Fri, 29 Jun 2012 13:02:46 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B4FF28FC0A;
	Fri, 29 Jun 2012 13:02:46 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5TD2kML047172;
	Fri, 29 Jun 2012 13:02:46 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5TD2krY047170;
	Fri, 29 Jun 2012 13:02:46 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201206291302.q5TD2krY047170@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Fri, 29 Jun 2012 13:02:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237779 - stable/8/sys/boot
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jun 2012 13:02:46 -0000

Author: avg
Date: Fri Jun 29 13:02:46 2012
New Revision: 237779
URL: http://svn.freebsd.org/changeset/base/237779

Log:
  fix a mismerge in r237765
  
  sys/boot stable/8 doesn't have Makefile.spac64, instead it has
  spar64-specific blocks in Makefile.
  This is a direct commit.
  
  Pointyhat to:	avg

Modified:
  stable/8/sys/boot/Makefile

Modified: stable/8/sys/boot/Makefile
==============================================================================
--- stable/8/sys/boot/Makefile	Fri Jun 29 13:00:28 2012	(r237778)
+++ stable/8/sys/boot/Makefile	Fri Jun 29 13:02:46 2012	(r237779)
@@ -22,7 +22,7 @@ SUBDIR+=		ofw
 SUBDIR+=		uboot
 .endif
 
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386"
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || ${MACHINE_ARCH} == "sparc64"
 SUBDIR+=		zfs
 .endif