From owner-p4-projects@FreeBSD.ORG  Wed Apr 23 18:42:24 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D4C0E37B416; Wed, 23 Apr 2003 18:42:22 -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 69D0F37B401
	for <perforce@freebsd.org>; Wed, 23 Apr 2003 18:42:22 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 106F943F3F
	for <perforce@freebsd.org>; Wed, 23 Apr 2003 18:42:22 -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 h3O1gL0U075867
	for <perforce@freebsd.org>; Wed, 23 Apr 2003 18:42:21 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3O1gLTe075860
	for perforce@freebsd.org; Wed, 23 Apr 2003 18:42:21 -0700 (PDT)
Date: Wed, 23 Apr 2003 18:42:21 -0700 (PDT)
Message-Id: <200304240142.h3O1gLTe075860@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 29576 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, 24 Apr 2003 01:42:25 -0000

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

Change 29576 by peter@peter_daintree on 2003/04/23 18:41:42

	add back some devices for real hardware

Affected files ...

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

Differences ...

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

@@ -23,7 +23,7 @@
 ident		GENERIC
 maxusers	0
 
-#options 	INET
+options 	INET
 options		SCHED_4BSD
 options 	FFS
 options		SOFTUPDATES
@@ -34,27 +34,27 @@
 options	INVARIANTS
 options INVARIANT_SUPPORT
 
-#device	pci
-#device	miibus
-#device	bge
-#device	fxp
+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