From owner-p4-projects@FreeBSD.ORG  Sat Feb 16 23:00:10 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0C1D316A420; Sat, 16 Feb 2008 23:00:10 +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 C5C1F16A417
	for <perforce@freebsd.org>; Sat, 16 Feb 2008 23:00:09 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A65BD13C458
	for <perforce@freebsd.org>; Sat, 16 Feb 2008 23:00:09 +0000 (UTC)
	(envelope-from marcel@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 m1GN09Qv064785
	for <perforce@freebsd.org>; Sat, 16 Feb 2008 23:00:09 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1GN09qq064782
	for perforce@freebsd.org; Sat, 16 Feb 2008 23:00:09 GMT
	(envelope-from marcel@freebsd.org)
Date: Sat, 16 Feb 2008 23:00:09 GMT
Message-Id: <200802162300.m1GN09qq064782@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 135533 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, 16 Feb 2008 23:00:10 -0000

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

Change 135533 by marcel@marcel_xcllnt on 2008/02/16 22:59:41

	Resolve merge...

Affected files ...

.. //depot/projects/e500/sys/boot/uboot/common/Makefile.inc#3 edit
.. //depot/projects/e500/sys/boot/uboot/common/main.c#5 edit

Differences ...

==== //depot/projects/e500/sys/boot/uboot/common/Makefile.inc#3 (text+ko) ====

@@ -1,3 +1,3 @@
-# $FreeBSD: src/sys/boot/ofw/common/Makefile.inc,v 1.1 2000/11/10 06:39:49 benno Exp $
+# $FreeBSD: src/sys/boot/uboot/common/Makefile.inc,v 1.1 2008/02/16 22:13:11 marcel Exp $
 
 SRCS+=	main.c

==== //depot/projects/e500/sys/boot/uboot/common/main.c#5 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/ofw/common/main.c,v 1.7 2004/08/16 15:45:24 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/uboot/common/main.c,v 1.1 2008/02/16 22:13:11 marcel Exp $");
 
 #include <stand.h>
 #include "bootstrap.h"
@@ -35,8 +35,6 @@
 #include "libuboot.h"
 #include "api_public.h"
 
-#define DEBUG
-
 struct uboot_devdesc	currdev;
 struct arch_switch	archsw;		/* MI/MD interface boundary */
 int			devs_no;