From owner-svn-src-projects@FreeBSD.ORG  Sat Nov 21 16:17:12 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 380001065730;
	Sat, 21 Nov 2009 16:17:12 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2444F8FC17;
	Sat, 21 Nov 2009 16:17:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nALGHBYT084604;
	Sat, 21 Nov 2009 16:17:11 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nALGHBlw084602;
	Sat, 21 Nov 2009 16:17:11 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <200911211617.nALGHBlw084602@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 21 Nov 2009 16:17:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199637 - projects/ppc64/sys/powerpc64/conf
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Nov 2009 16:17:12 -0000

Author: nwhitehorn
Date: Sat Nov 21 16:17:11 2009
New Revision: 199637
URL: http://svn.freebsd.org/changeset/base/199637

Log:
  Add USB back in: ohci and ehci work again.

Modified:
  projects/ppc64/sys/powerpc64/conf/GENERIC

Modified: projects/ppc64/sys/powerpc64/conf/GENERIC
==============================================================================
--- projects/ppc64/sys/powerpc64/conf/GENERIC	Sat Nov 21 16:16:30 2009	(r199636)
+++ projects/ppc64/sys/powerpc64/conf/GENERIC	Sat Nov 21 16:17:11 2009	(r199637)
@@ -78,7 +78,7 @@ options 	WITNESS			#Enable checks to det
 options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
 
 # To make an SMP kernel, the next line is needed
-options 	SMP			# Symmetric MultiProcessor Kernel
+#options 	SMP			# Symmetric MultiProcessor Kernel
 
 # CPU frequency control
 #device		cpufreq
@@ -136,8 +136,8 @@ device		bpf		#Berkeley packet filter
 
 # USB support
 device		uhci		# UHCI PCI->USB interface
-#device		ohci		# OHCI PCI->USB interface
-#device		ehci		# EHCI PCI->USB interface
+device		ohci		# OHCI PCI->USB interface
+device		ehci		# EHCI PCI->USB interface
 device		usb		# USB Bus (required)
 device		uhid		# "Human Interface Devices"
 device		ukbd		# Keyboard
@@ -172,5 +172,5 @@ device		kiic		# Keywest I2C
 
 options 	KTR
 options 	KTR_COMPILE=0xffffffff
-#options 	KTR_MASK=KTR_SIG
+#options 	KTR_MASK=(KTR_SYSC)
 options 	KTR_VERBOSE