From owner-p4-projects@FreeBSD.ORG  Wed Apr  9 20:45:52 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CFDF137B404; Wed,  9 Apr 2003 20:45:51 -0700 (PDT)
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 D134837B407
	for <perforce@freebsd.org>; Wed,  9 Apr 2003 20:45:50 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5C3CB43FAF
	for <perforce@freebsd.org>; Wed,  9 Apr 2003 20:45:50 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3A3jo0U095127
	for <perforce@freebsd.org>; Wed, 9 Apr 2003 20:45:50 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3A3jns8095124
	for perforce@freebsd.org; Wed, 9 Apr 2003 20:45:49 -0700 (PDT)
Date: Wed, 9 Apr 2003 20:45:49 -0700 (PDT)
Message-Id: <200304100345.h3A3jns8095124@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 28685 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: Thu, 10 Apr 2003 03:45:52 -0000

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

Change 28685 by peter@peter_daintree on 2003/04/09 20:45:45

	ok, that was fun, now lets get on with real work

Affected files ...

.. //depot/projects/hammer/sys/x86_64/conf/GENERIC#6 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/conf/GENERIC#6 (text+ko) ====

@@ -23,7 +23,7 @@
 ident		GENERIC
 maxusers	0
 
-options 	INET
+#options 	INET
 options		SCHED_4BSD
 options 	FFS
 options		SOFTUPDATES
@@ -31,44 +31,47 @@
 device	isa
 device	sio
 
-device	pci
-device	miibus
-device	bge
-device	fxp
+options	INVARIANTS
+options INVARIANT_SUPPORT
+
+#device	pci
+#device	miibus
+#device	bge
+#device	fxp
 
-device		random		# Entropy device
-device	loop
-device	ether
+#device		random		# Entropy device
+#device	loop
+#device	ether
 device	md
 
-device	ata
-device	atadisk
-device		atapicd			# ATAPI CDROM drives
+#device	ata
+#device	atadisk
+#device		atapicd			# ATAPI CDROM drives
 
 # USB support
-device          uhci            # UHCI PCI->USB interface
-device          ohci            # OHCI PCI->USB interface
-device          usb             # USB Bus (required)
-device          ugen            # Generic
-device          uhid            # "Human Interface Devices"
-device          ukbd            # Keyboard
+#device          uhci            # UHCI PCI->USB interface
+#device          ohci            # OHCI PCI->USB interface
+#device          usb             # USB Bus (required)
+#device          ugen            # Generic
+#device          uhid            # "Human Interface Devices"
+#device          ukbd            # Keyboard
 
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
-device		atkbdc		# AT keyboard controller
-device		atkbd		# AT keyboard
-device		psm		# PS/2 mouse
+#device		atkbdc		# AT keyboard controller
+#device		atkbd		# AT keyboard
+#device		psm		# PS/2 mouse
 
-device		vga		# VGA video card driver
+#device		vga		# VGA video card driver
 
-device		splash		# Splash screen and screen saver support
+#device		splash		# Splash screen and screen saver support
 
 # syscons is the default console driver, resembling an SCO console
-device		sc
+#device		sc
 
 #device		agp		# support several AGP chipsets
 
 # Parallel port
-device		ppc
-device		ppbus		# Parallel port bus (required)
-device		lpt		# Printer
+#device		ppc
+#device		ppbus		# Parallel port bus (required)
+#device		lpt		# Printer