PERFORCE change 48315 for review

[Peter Wemm]

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

Change 48315 by peter at 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)