From owner-p4-projects@FreeBSD.ORG  Tue Nov 21 17:25:42 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 EB1C816B83E; Tue, 21 Nov 2006 17:23:50 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id ABEA516B336
	for <perforce@freebsd.org>; Tue, 21 Nov 2006 17:21:48 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1CFE943F0E
	for <perforce@freebsd.org>; Tue, 21 Nov 2006 17:17:49 +0000 (GMT)
	(envelope-from imp@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 kALHIC54068519
	for <perforce@freebsd.org>; Tue, 21 Nov 2006 17:18:12 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kALHICXM068512
	for perforce@freebsd.org; Tue, 21 Nov 2006 17:18:12 GMT
	(envelope-from imp@freebsd.org)
Date: Tue, 21 Nov 2006 17:18:12 GMT
Message-Id: <200611211718.kALHICXM068512@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 110284 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: Tue, 21 Nov 2006 17:25:42 -0000

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

Change 110284 by imp@imp_paco-paco on 2006/11/20 06:40:12

	Merge cleaned up files.avila by hand, it didn't take for some reason.

Affected files ...

.. //depot/projects/arm/src/sys/arm/xscale/ixp425/files.avila#7 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/xscale/ixp425/files.avila#7 (text+ko) ====

@@ -1,6 +1,4 @@
-#$FreeBSD$
+#$FreeBSD: src/sys/arm/xscale/ixp425/files.avila,v 1.1 2006/11/19 23:55:23 sam Exp $
 arm/xscale/ixp425/avila_machdep.c	standard
-arm/xscale/ixp425/avila_ata.c		optional ata_avila
-arm/xscale/ixp425/ad7418.c		optional adc_avila
-arm/xscale/ixp425/ds1672.c		optional rtc_avila
+arm/xscale/ixp425/avila_ata.c		optional avila_ata
 arm/xscale/ixp425/ixdp425_pci.c		optional pci