Date: Sat, 16 Feb 2008 23:00:09 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 135533 for review Message-ID: <200802162300.m1GN09qq064782@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802162300.m1GN09qq064782>