Date: Tue, 16 Mar 2004 14:26:45 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 49127 for review Message-ID: <200403162226.i2GMQjxC065658@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=49127 Change 49127 by peter@peter_daintree on 2004/03/16 14:25:44 integ -I -b i386_hammer Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#32 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#33 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#6 integrate .. //depot/projects/hammer/sys/amd64/conf/NOTES#23 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#32 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#33 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/conf/GENERIC.hints#6 (text+ko) ==== @@ -79,11 +79,6 @@ hint.fe.0.at="isa" hint.fe.0.disabled="1" hint.fe.0.port="0x300" -hint.le.0.at="isa" -hint.le.0.disabled="1" -hint.le.0.port="0x300" -hint.le.0.irq="5" -hint.le.0.maddr="0xd0000" hint.lnc.0.at="isa" hint.lnc.0.disabled="1" hint.lnc.0.port="0x280" ==== //depot/projects/hammer/sys/amd64/conf/NOTES#23 (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.1136) +# (XXX from i386:NOTES,v 1.1148) # $FreeBSD: src/sys/amd64/conf/NOTES,v 1.12 2004/03/13 22:16:34 peter Exp $ # @@ -232,10 +232,10 @@ # Network interfaces: # -# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) +# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf) -# (requires miibus) +# (requires miibus) # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and # Am79C960)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403162226.i2GMQjxC065658>