From f48a19aa930ab72e9c2fc98bf56f80baef64220f Mon Sep 17 00:00:00 2001
From: "Jayachandran C." <jchandra@FreeBSD.org>
Date: Sat, 19 Nov 2011 14:33:14 +0000
Subject: [PATCH] Fix USB compilation, and add USB options to XLP conf

Remove obsolete header file included in usb_init.c
---
 sys/mips/conf/std.XLP   | 8 ++++++++
 sys/mips/nlm/usb_init.c | 1 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/sys/mips/conf/std.XLP b/sys/mips/conf/std.XLP
index 6e594f69e5a..d1619e345d9 100644
--- a/sys/mips/conf/std.XLP
+++ b/sys/mips/conf/std.XLP
@@ -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
diff --git a/sys/mips/nlm/usb_init.c b/sys/mips/nlm/usb_init.c
index 32a6165c60d..cb4d7624b88 100644
--- a/sys/mips/nlm/usb_init.c
+++ b/sys/mips/nlm/usb_init.c
@@ -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>