PERFORCE change 97443 for review

[John Birrell]

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

Change 97443 by jb at jb_freebsd2 on 2006/05/19 04:30:17

	A merge I missed.

Affected files ...

.. //depot/projects/dtrace/src/sys/conf/files.i386#6 edit

Differences ...

==== //depot/projects/dtrace/src/sys/conf/files.i386#6 (text+ko) ====

@@ -83,14 +83,8 @@
 	no-implicit-rule
 #
 #
->>>> ORIGINAL files.i386#190
-==== THEIRS files.i386#193
-compat/linprocfs/linprocfs.c	optional linprocfs
-compat/linsysfs/linsysfs.c	optional linsysfs
-==== YOURS files.i386
 cddl/i386/cyclic_machdep.c	optional cyclic \
 	compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat"
-<<<<
 compat/linux/linux_file.c	optional compat_linux
 compat/linux/linux_getcwd.c	optional compat_linux
 compat/linux/linux_ioctl.c	optional compat_linux