From owner-p4-projects@FreeBSD.ORG  Wed Apr 30 18:19:31 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E827537B401; Wed, 30 Apr 2003 18:19:30 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9A60537B404
	for <perforce@freebsd.org>; Wed, 30 Apr 2003 18:19:30 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1911443F93
	for <perforce@freebsd.org>; Wed, 30 Apr 2003 18:19:30 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h411JT0U062314
	for <perforce@freebsd.org>; Wed, 30 Apr 2003 18:19:29 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h411JTdA062309
	for perforce@freebsd.org; Wed, 30 Apr 2003 18:19:29 -0700 (PDT)
Date: Wed, 30 Apr 2003 18:19:29 -0700 (PDT)
Message-Id: <200305010119.h411JTdA062309@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 30218 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 May 2003 01:19:31 -0000

http://perforce.freebsd.org/chv.cgi?CH=30218

Change 30218 by peter@peter_daintree on 2003/04/30 18:19:03

	fix mismerge

Affected files ...

.. //depot/projects/hammer/sys/boot/Makefile#5 edit

Differences ...

==== //depot/projects/hammer/sys/boot/Makefile#5 (text+ko) ====

@@ -5,11 +5,6 @@
 MACHINE=i386
 .endif
 
-.if ${MACHINE_ARCH} == "amd64"
-MACHINE_ARCH=i386
-MACHINE=i386
-.endif
-
 .if !defined(NOFORTH)
 # Build the add-in FORTH interpreter
 SUBDIR+=		ficl