From owner-p4-projects@FreeBSD.ORG  Fri May 19 21:33:52 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6418716A424; Fri, 19 May 2006 21:33:52 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 4268616A422
	for <perforce@freebsd.org>; Fri, 19 May 2006 21:33:52 +0000 (UTC)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EE0A043D45
	for <perforce@freebsd.org>; Fri, 19 May 2006 21:33:51 +0000 (GMT)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4JLXL7B058894
	for <perforce@freebsd.org>; Fri, 19 May 2006 21:33:21 GMT
	(envelope-from cognet@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4JLXLjc058891
	for perforce@freebsd.org; Fri, 19 May 2006 21:33:21 GMT
	(envelope-from cognet@freebsd.org)
Date: Fri, 19 May 2006 21:33:21 GMT
Message-Id: <200605192133.k4JLXLjc058891@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cognet@freebsd.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 97471 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: Fri, 19 May 2006 21:33:52 -0000

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

Change 97471 by cognet@cognet on 2006/05/19 21:33:08

	Fix mismerge.

Affected files ...

.. //depot/projects/arm/src/sys/conf/options.arm#9 edit

Differences ...

==== //depot/projects/arm/src/sys/conf/options.arm#9 (text+ko) ====

@@ -10,6 +10,7 @@
 CPU_ARM9		opt_global.h
 CPU_XSCALE_80321	opt_global.h
 KERNPHYSADDR		opt_global.h
+KERNVIRTADDR		opt_global.h
 PHYSADDR		opt_global.h
 SKYEYE_WORKAROUNDS	opt_global.h
 STARTUP_PAGETABLE_ADDR	opt_global.h