Module Name: src
Committed By: dyoung
Date: Thu Nov 4 01:58:07 UTC 2010
Modified Files:
src/sys/dev/usb: moscom.c uark.c uhmodem.c uyurex.c xboxcontroller.c
Log Message:
Remove temporary #inclusion of <dev/usb/usb_port.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/usb/moscom.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/uark.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/usb/uhmodem.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/uyurex.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/usb/xboxcontroller.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/moscom.c
diff -u src/sys/dev/usb/moscom.c:1.4 src/sys/dev/usb/moscom.c:1.5
--- src/sys/dev/usb/moscom.c:1.4 Wed Nov 3 23:46:35 2010
+++ src/sys/dev/usb/moscom.c Thu Nov 4 01:58:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: moscom.c,v 1.4 2010/11/03 23:46:35 dyoung Exp $ */
+/* $NetBSD: moscom.c,v 1.5 2010/11/04 01:58:07 dyoung Exp $ */
/* $OpenBSD: moscom.c,v 1.11 2007/10/11 18:33:14 deraadt Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1.4 2010/11/03 23:46:35 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1.5 2010/11/04 01:58:07 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -35,8 +35,6 @@
#include <dev/usb/usbdevs.h>
#include <dev/usb/ucomvar.h>
-#include <dev/usb/usb_port.h>
-
#define MOSCOMBUFSZ 256
#define MOSCOM_CONFIG_NO 0
#define MOSCOM_IFACE_NO 0
Index: src/sys/dev/usb/uark.c
diff -u src/sys/dev/usb/uark.c:1.2 src/sys/dev/usb/uark.c:1.3
--- src/sys/dev/usb/uark.c:1.2 Wed Nov 3 23:46:35 2010
+++ src/sys/dev/usb/uark.c Thu Nov 4 01:58:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uark.c,v 1.2 2010/11/03 23:46:35 dyoung Exp $ */
+/* $NetBSD: uark.c,v 1.3 2010/11/04 01:58:07 dyoung Exp $ */
/* $OpenBSD: uark.c,v 1.13 2009/10/13 19:33:17 pirofti Exp $ */
/*
@@ -31,8 +31,6 @@
#include <dev/usb/ucomvar.h>
-#include <dev/usb/usb_port.h>
-
#ifdef UARK_DEBUG
#define DPRINTFN(n, x) do { if (uarkdebug > (n)) printf x; } while (0)
int uarkebug = 0;
Index: src/sys/dev/usb/uhmodem.c
diff -u src/sys/dev/usb/uhmodem.c:1.10 src/sys/dev/usb/uhmodem.c:1.11
--- src/sys/dev/usb/uhmodem.c:1.10 Wed Nov 3 23:46:35 2010
+++ src/sys/dev/usb/uhmodem.c Thu Nov 4 01:58:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uhmodem.c,v 1.10 2010/11/03 23:46:35 dyoung Exp $ */
+/* $NetBSD: uhmodem.c,v 1.11 2010/11/04 01:58:07 dyoung Exp $ */
/*
* Copyright (c) 2008 Yojiro UO <[email protected]>.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhmodem.c,v 1.10 2010/11/03 23:46:35 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhmodem.c,v 1.11 2010/11/04 01:58:07 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -94,8 +94,6 @@
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdivar.h>
-#include <dev/usb/usb_port.h>
-
#include <dev/usb/usbcdc.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/usb_quirks.h>
Index: src/sys/dev/usb/uyurex.c
diff -u src/sys/dev/usb/uyurex.c:1.3 src/sys/dev/usb/uyurex.c:1.4
--- src/sys/dev/usb/uyurex.c:1.3 Wed Nov 3 23:46:35 2010
+++ src/sys/dev/usb/uyurex.c Thu Nov 4 01:58:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uyurex.c,v 1.3 2010/11/03 23:46:35 dyoung Exp $ */
+/* $NetBSD: uyurex.c,v 1.4 2010/11/04 01:58:07 dyoung Exp $ */
/* $OpenBSD: uyurex.c,v 1.3 2010/03/04 03:47:22 deraadt Exp $ */
/*
@@ -38,8 +38,6 @@
#include <dev/usb/uhidev.h>
#include <dev/usb/hid.h>
-#include <dev/usb/usb_port.h>
-
#ifdef USB_DEBUG
#define UYUREX_DEBUG
#endif
Index: src/sys/dev/usb/xboxcontroller.c
diff -u src/sys/dev/usb/xboxcontroller.c:1.13 src/sys/dev/usb/xboxcontroller.c:1.14
--- src/sys/dev/usb/xboxcontroller.c:1.13 Wed Nov 3 23:46:35 2010
+++ src/sys/dev/usb/xboxcontroller.c Thu Nov 4 01:58:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: xboxcontroller.c,v 1.13 2010/11/03 23:46:35 dyoung Exp $ */
+/* $NetBSD: xboxcontroller.c,v 1.14 2010/11/04 01:58:07 dyoung Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xboxcontroller.c,v 1.13 2010/11/03 23:46:35 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xboxcontroller.c,v 1.14 2010/11/04 01:58:07 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,8 +44,6 @@
#include <dev/usb/usbdi_util.h>
#include <dev/usb/usbdevs.h>
-#include <dev/usb/usb_port.h>
-
#define XBOX_CONTROLLER_BUFSZ 32
struct xboxcontroller_softc {