From owner-p4-projects@FreeBSD.ORG  Wed Apr 30 00:19:06 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7769337B404; Wed, 30 Apr 2003 00:19:05 -0700 (PDT)
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 2598A37B401
	for <perforce@freebsd.org>; Wed, 30 Apr 2003 00:19:05 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AF4BC43F93
	for <perforce@freebsd.org>; Wed, 30 Apr 2003 00:19:04 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3U7J40U025647
	for <perforce@freebsd.org>; Wed, 30 Apr 2003 00:19:04 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3U7J4Mm025641
	for perforce@freebsd.org; Wed, 30 Apr 2003 00:19:04 -0700 (PDT)
Date: Wed, 30 Apr 2003 00:19:04 -0700 (PDT)
Message-Id: <200304300719.h3U7J4Mm025641@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>
Subject: PERFORCE change 30079 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Wed, 30 Apr 2003 07:19:06 -0000

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

Change 30079 by marcel@marcel_pluto2 on 2003/04/30 00:18:22

	Fix a botched merge.

Affected files ...

.. //depot/projects/ia64/sys/conf/files.ia64#38 edit

Differences ...

==== //depot/projects/ia64/sys/conf/files.ia64#38 (text+ko) ====

@@ -27,7 +27,6 @@
 dev/fb/fb.c			optional	fb
 dev/fb/fb.c			optional	vga sc
 dev/fb/splash.c			optional	splash
-dev/fb/vga.c			optional	vga
 dev/kbd/atkbd.c			optional	atkbd
 dev/kbd/atkbdc.c		optional	atkbdc
 dev/kbd/kbd.c			optional	atkbd