Module Name:	basesrc
Committed By:	bjh21
Date:		Thu Nov 29 23:08:54 UTC 2001

Modified Files:
	basesrc/sbin/disklabel: Makefile disklabel.c

Log Message:
Rather than making FileCore boot block support conditional on __arm32__, make
it conditional on USE_ACORN, and define that if MACHINE is arm26 or acorn32.
This is less than optimal, and maybe we should define it for all ARM systems,
but then disklabel handling across architectures is generally a mess at the
moment.


To generate a diff of this commit:
cvs rdiff -r1.40 -r1.41 basesrc/sbin/disklabel/Makefile
cvs rdiff -r1.99 -r1.100 basesrc/sbin/disklabel/disklabel.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.