From owner-p4-projects@FreeBSD.ORG Tue Mar 16 14:26:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 634B216A4D0; Tue, 16 Mar 2004 14:26:46 -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 39CBF16A4CE for ; Tue, 16 Mar 2004 14:26:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3252743D31 for ; Tue, 16 Mar 2004 14:26:46 -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 i2GMQjGe065661 for ; Tue, 16 Mar 2004 14:26:45 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2GMQjxC065658 for perforce@freebsd.org; Tue, 16 Mar 2004 14:26:45 -0800 (PST) (envelope-from peter@freebsd.org) Date: Tue, 16 Mar 2004 14:26:45 -0800 (PST) Message-Id: <200403162226.i2GMQjxC065658@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 49127 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Mar 2004 22:26:47 -0000 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)