From owner-p4-projects@FreeBSD.ORG  Sat Oct 20 23:56:35 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D4F4216A420; Sat, 20 Oct 2007 23:56:34 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 84E1916A41A
	for <perforce@freebsd.org>; Sat, 20 Oct 2007 23:56:34 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 569C613C43E
	for <perforce@freebsd.org>; Sat, 20 Oct 2007 23:56:34 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9KNuYFw075607
	for <perforce@freebsd.org>; Sat, 20 Oct 2007 23:56:34 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9KNuYUu075604
	for perforce@freebsd.org; Sat, 20 Oct 2007 23:56:34 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 20 Oct 2007 23:56:34 GMT
Message-Id: <200710202356.l9KNuYUu075604@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127864 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sat, 20 Oct 2007 23:56:35 -0000

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

Change 127864 by jb@jb_freebsd1 on 2007/10/20 23:56:21

	Fix a mis-merge.

Affected files ...

.. //depot/projects/dtrace6/src/sys/sys/linker.h#3 edit

Differences ...

==== //depot/projects/dtrace6/src/sys/sys/linker.h#3 (text+ko) ====

@@ -278,8 +278,6 @@
 #define ELF_RELOC_REL	1
 #define ELF_RELOC_RELA	2
 
-#endif /* _KERNEL */
-
 /*
  * This is version 1 of the KLD file status structure. It is identified
  * by it's _size_ in the version field.