From owner-p4-projects@FreeBSD.ORG  Sat Mar  6 19:46:00 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 69FB116A4D0; Sat,  6 Mar 2004 19:46:00 -0800 (PST)
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 449C416A4CE
	for <perforce@freebsd.org>; Sat,  6 Mar 2004 19:46:00 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3C34A43D2D
	for <perforce@freebsd.org>; Sat,  6 Mar 2004 19:46:00 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i273k0Ge047488
	for <perforce@freebsd.org>; Sat, 6 Mar 2004 19:46:00 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i273jxNf047431
	for perforce@freebsd.org; Sat, 6 Mar 2004 19:45:59 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Sat, 6 Mar 2004 19:45:59 -0800 (PST)
Message-Id: <200403070345.i273jxNf047431@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 48315 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: Sun, 07 Mar 2004 03:46:00 -0000

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

Change 48315 by peter@peter_daintree on 2004/03/06 19:45:47

	integrate -I -b i386_hammer

Affected files ...

.. //depot/projects/hammer/sys/amd64/conf/NOTES#18 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/conf/NOTES#18 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# (XXX from i386:NOTES,v 1.1133)
+# (XXX from i386:NOTES,v 1.1134)
 # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.10 2004/03/05 08:04:10 obrien Exp $
 #
 
@@ -238,12 +238,10 @@
 #	(requires miibus)
 # lnc:  Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and
 #       Am79C960)
-# nv:	nVidia nForce MCP on-board Networking.
 
 #XXX#	still calls MD i386 kvtop function instead of vtophys etc
 #XXX#device		ed
 #XXX#device		lnc
-device		nv
 
 #XXX#device	ath
 #XXX#device	ath_hal		# Atheros HAL (includes binary component)