svn commit: r227725 - in head/sys/mips: conf nlm

[Jayachandran C.]

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>