From owner-cvs-all@FreeBSD.ORG  Fri Jul  9 05:05:14 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 3C79F16A4CF; Fri,  9 Jul 2004 05:05:14 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 1DBFA43D49; Fri,  9 Jul 2004 05:05:14 +0000 (GMT)
	(envelope-from imp@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6955E7w041388;
	Fri, 9 Jul 2004 05:05:14 GMT
	(envelope-from imp@repoman.freebsd.org)
Received: (from imp@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6955DjB041387;
	Fri, 9 Jul 2004 05:05:13 GMT
	(envelope-from imp)
Message-Id: <200407090505.i6955DjB041387@repoman.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 9 Jul 2004 05:05:13 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/conf files.amd64
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jul 2004 05:05:14 -0000

imp         2004-07-09 05:05:13 UTC

  FreeBSD src repository

  Modified files:
    sys/conf             files.amd64 
  Log:
  Fix mismerge of fdc.  Also, OLDCARD never was supported on amd64, so
  remove fdc attachment for it.
  
  Revision  Changes    Path
  1.40      +1 -1      src/sys/conf/files.amd64