PERFORCE change 30218 for review

[Peter Wemm]

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

Change 30218 by peter at 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