From owner-svn-src-all@FreeBSD.ORG  Sat Nov 19 14:33:15 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 29B541065672;
	Sat, 19 Nov 2011 14:33:15 +0000 (UTC)
	(envelope-from jchandra@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 18D0A8FC14;
	Sat, 19 Nov 2011 14:33:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAJEXE5A047416;
	Sat, 19 Nov 2011 14:33:14 GMT
	(envelope-from jchandra@svn.freebsd.org)
Received: (from jchandra@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAJEXEgt047413;
	Sat, 19 Nov 2011 14:33:14 GMT
	(envelope-from jchandra@svn.freebsd.org)
Message-Id: <201111191433.pAJEXEgt047413@svn.freebsd.org>
From: "Jayachandran C." <jchandra@FreeBSD.org>
Date: Sat, 19 Nov 2011 14:33:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227725 - in head/sys/mips: conf nlm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Nov 2011 14:33:15 -0000

Author: jchandra
Date: Sat Nov 19 14:33:14 2011
New Revision: 227725
URL: http://svn.freebsd.org/changeset/base/227725

Log:
  Fix USB compilation, and add USB options to XLP conf
  
  Remove obsolete header file included in usb_init.c

Modified:
  head/sys/mips/conf/std.XLP
  head/sys/mips/nlm/usb_init.c

Modified: head/sys/mips/conf/std.XLP
==============================================================================
--- head/sys/mips/conf/std.XLP	Sat Nov 19 14:14:35 2011	(r227724)
+++ head/sys/mips/conf/std.XLP	Sat Nov 19 14:33:14 2011	(r227725)
@@ -76,6 +76,14 @@ device		scbus
 #device		ata
 #device		atadisk
 
+# USB
+device		usb			# USB Bus (required)
+device		ehci			# EHCI PCI->USB interface (USB 2.0)
+#options 	USB_DEBUG		# enable debug msgs
+#device		ugen			# Generic
+#device		uhid			# "Human Interface Devices"
+device		umass			# Requires scbus and da
+
 options 	FDT
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=xlp-basic.dts

Modified: head/sys/mips/nlm/usb_init.c
==============================================================================
--- head/sys/mips/nlm/usb_init.c	Sat Nov 19 14:14:35 2011	(r227724)
+++ head/sys/mips/nlm/usb_init.c	Sat Nov 19 14:33:14 2011	(r227725)
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 
 #include <mips/nlm/hal/haldefs.h>
 #include <mips/nlm/hal/iomap.h>
-#include <mips/nlm/hal/cpuinfo.h>
 #include <mips/nlm/hal/usb.h>
 
 #include <mips/nlm/xlp.h>