From owner-p4-projects@FreeBSD.ORG  Sat Mar 13 14:49:06 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A1F5516A4D0; Sat, 13 Mar 2004 14:49:06 -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 57BE016A4CF
	for <perforce@freebsd.org>; Sat, 13 Mar 2004 14:49:06 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5128343D2F
	for <perforce@freebsd.org>; Sat, 13 Mar 2004 14:49:06 -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 i2DMn6Ge070363
	for <perforce@freebsd.org>; Sat, 13 Mar 2004 14:49:06 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i2DMn5iQ070360
	for perforce@freebsd.org; Sat, 13 Mar 2004 14:49:05 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Sat, 13 Mar 2004 14:49:05 -0800 (PST)
Message-Id: <200403132249.i2DMn5iQ070360@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 48920 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: Sat, 13 Mar 2004 22:49:07 -0000

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

Change 48920 by peter@peter_overcee on 2004/03/13 14:48:32

	converge with current

Affected files ...

.. //depot/projects/hammer/sys/amd64/conf/NOTES#21 edit
.. //depot/projects/hammer/sys/conf/options.amd64#29 edit

Differences ...

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

@@ -295,8 +295,6 @@
 #  The Rev 2 host cards use a 32K chunk, on a 32K boundary.
 #  The cards can use an IRQ of 11, 12 or 15.
 
-#XXX#device		cy	1
-#XXX#options 	CY_PCI_FASTINTR		# Use with cy_pci unless irq is shared
 device		digi
 hint.digi.0.at="isa"
 hint.digi.0.port="0x104"
@@ -495,10 +493,6 @@
 
 options 	FB_INSTALL_CDEV		# install a CDEV entry in /dev
 
-# PECOFF module (Win32 Execution Format)
-#XXX#options 	PECOFF_SUPPORT		# only knows 32 bit file format
-#XXX#options 	PECOFF_DEBUG
-
 options 	ENABLE_ALART		# Control alarm on Intel intpm driver
 options 	KBDIO_DEBUG=2
 options 	KBD_MAXRETRY=4

==== //depot/projects/hammer/sys/conf/options.amd64#29 (text+ko) ====

@@ -15,8 +15,6 @@
 #COMPAT_SVR4		opt_dontuse.h
 #DEBUG_SVR4		opt_svr4.h
 #NDISAPI		opt_dontuse.h
-#PECOFF_DEBUG		opt_pecoff.h
-#PECOFF_SUPPORT		opt_dontuse.h
 
 CLK_CALIBRATION_LOOP		opt_clock.h
 CLK_USE_I8254_CALIBRATION	opt_clock.h