From owner-p4-projects@FreeBSD.ORG  Thu Apr 24 18:07:32 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 307E037B404; Thu, 24 Apr 2003 18:07:32 -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 BECB437B401
	for <perforce@freebsd.org>; Thu, 24 Apr 2003 18:07:31 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6961043F75
	for <perforce@freebsd.org>; Thu, 24 Apr 2003 18:07:31 -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 h3P17V0U029126
	for <perforce@freebsd.org>; Thu, 24 Apr 2003 18:07:31 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3P17Vtf029121
	for perforce@freebsd.org; Thu, 24 Apr 2003 18:07:31 -0700 (PDT)
Date: Thu, 24 Apr 2003 18:07:31 -0700 (PDT)
Message-Id: <200304250107.h3P17Vtf029121@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 29659 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: Fri, 25 Apr 2003 01:07:33 -0000

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

Change 29659 by peter@peter_daintree on 2003/04/24 18:06:43

	keep usb out of it, its breaking something with shared interrupts

Affected files ...

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

Differences ...

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

@@ -51,12 +51,12 @@
 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