Module Name: src
Committed By: mrg
Date: Sun Feb 26 06:28:59 UTC 2012
Modified Files:
src/sys/dev/usb [jmcneill-usbmp]: emdtv.c emdtv_dtv.c ezload.c if_cue.c
if_kue.c if_otus.c if_upgt.c udsbr.c
Log Message:
include usbdivar.h in several places that should.
To generate a diff of this commit:
cvs rdiff -u -r1.4.6.1 -r1.4.6.2 src/sys/dev/usb/emdtv.c
cvs rdiff -u -r1.5.6.1 -r1.5.6.2 src/sys/dev/usb/emdtv_dtv.c
cvs rdiff -u -r1.12 -r1.12.38.1 src/sys/dev/usb/ezload.c
cvs rdiff -u -r1.60.12.2 -r1.60.12.3 src/sys/dev/usb/if_cue.c
cvs rdiff -u -r1.74.12.2 -r1.74.12.3 src/sys/dev/usb/if_kue.c
cvs rdiff -u -r1.9 -r1.9.14.1 src/sys/dev/usb/if_otus.c
cvs rdiff -u -r1.3.14.1 -r1.3.14.2 src/sys/dev/usb/if_upgt.c
cvs rdiff -u -r1.18.12.1 -r1.18.12.2 src/sys/dev/usb/udsbr.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/emdtv.c
diff -u src/sys/dev/usb/emdtv.c:1.4.6.1 src/sys/dev/usb/emdtv.c:1.4.6.2
--- src/sys/dev/usb/emdtv.c:1.4.6.1 Sat Feb 18 07:35:04 2012
+++ src/sys/dev/usb/emdtv.c Sun Feb 26 06:28:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: emdtv.c,v 1.4.6.1 2012/02/18 07:35:04 mrg Exp $ */
+/* $NetBSD: emdtv.c,v 1.4.6.2 2012/02/26 06:28:58 mrg Exp $ */
/*-
* Copyright (c) 2008, 2011 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emdtv.c,v 1.4.6.1 2012/02/18 07:35:04 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emdtv.c,v 1.4.6.2 2012/02/26 06:28:58 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -38,6 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: emdtv.c,v 1.
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/emdtvvar.h>
Index: src/sys/dev/usb/emdtv_dtv.c
diff -u src/sys/dev/usb/emdtv_dtv.c:1.5.6.1 src/sys/dev/usb/emdtv_dtv.c:1.5.6.2
--- src/sys/dev/usb/emdtv_dtv.c:1.5.6.1 Sat Feb 18 07:35:04 2012
+++ src/sys/dev/usb/emdtv_dtv.c Sun Feb 26 06:28:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: emdtv_dtv.c,v 1.5.6.1 2012/02/18 07:35:04 mrg Exp $ */
+/* $NetBSD: emdtv_dtv.c,v 1.5.6.2 2012/02/26 06:28:58 mrg Exp $ */
/*-
* Copyright (c) 2008, 2011 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emdtv_dtv.c,v 1.5.6.1 2012/02/18 07:35:04 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emdtv_dtv.c,v 1.5.6.2 2012/02/26 06:28:58 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -37,6 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: emdtv_dtv.c,
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdevs.h>
#include <dev/i2c/i2cvar.h>
Index: src/sys/dev/usb/ezload.c
diff -u src/sys/dev/usb/ezload.c:1.12 src/sys/dev/usb/ezload.c:1.12.38.1
--- src/sys/dev/usb/ezload.c:1.12 Mon Apr 28 20:23:59 2008
+++ src/sys/dev/usb/ezload.c Sun Feb 26 06:28:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ezload.c,v 1.12 2008/04/28 20:23:59 martin Exp $ */
+/* $NetBSD: ezload.c,v 1.12.38.1 2012/02/26 06:28:58 mrg Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ezload.c,v 1.12 2008/04/28 20:23:59 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ezload.c,v 1.12.38.1 2012/02/26 06:28:58 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,6 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: ezload.c,v 1
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
#include <dev/usb/ezload.h>
Index: src/sys/dev/usb/if_cue.c
diff -u src/sys/dev/usb/if_cue.c:1.60.12.2 src/sys/dev/usb/if_cue.c:1.60.12.3
--- src/sys/dev/usb/if_cue.c:1.60.12.2 Fri Feb 24 09:11:42 2012
+++ src/sys/dev/usb/if_cue.c Sun Feb 26 06:28:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cue.c,v 1.60.12.2 2012/02/24 09:11:42 mrg Exp $ */
+/* $NetBSD: if_cue.c,v 1.60.12.3 2012/02/26 06:28:58 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <[email protected]>. All rights reserved.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.60.12.2 2012/02/24 09:11:42 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.60.12.3 2012/02/26 06:28:58 mrg Exp $");
#include "opt_inet.h"
@@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/socket.h>
-
+#include <sys/bus.h>
#include <sys/device.h>
#include <sys/rnd.h>
@@ -86,6 +86,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/if_cuereg.h>
Index: src/sys/dev/usb/if_kue.c
diff -u src/sys/dev/usb/if_kue.c:1.74.12.2 src/sys/dev/usb/if_kue.c:1.74.12.3
--- src/sys/dev/usb/if_kue.c:1.74.12.2 Sat Feb 25 12:53:34 2012
+++ src/sys/dev/usb/if_kue.c Sun Feb 26 06:28:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kue.c,v 1.74.12.2 2012/02/25 12:53:34 mrg Exp $ */
+/* $NetBSD: if_kue.c,v 1.74.12.3 2012/02/26 06:28:58 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <[email protected]>. All rights reserved.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.74.12.2 2012/02/25 12:53:34 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.74.12.3 2012/02/26 06:28:58 mrg Exp $");
#include "opt_inet.h"
@@ -83,25 +83,23 @@ __KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1
#include <sys/socket.h>
#include <sys/device.h>
#include <sys/proc.h>
-
#include <sys/rnd.h>
#include <net/if.h>
#include <net/if_arp.h>
#include <net/if_dl.h>
-
#include <net/bpf.h>
-
#include <net/if_ether.h>
+
#ifdef INET
#include <netinet/in.h>
#include <netinet/if_inarp.h>
#endif
-
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/if_kuereg.h>
Index: src/sys/dev/usb/if_otus.c
diff -u src/sys/dev/usb/if_otus.c:1.9 src/sys/dev/usb/if_otus.c:1.9.14.1
--- src/sys/dev/usb/if_otus.c:1.9 Thu Dec 2 17:38:05 2010
+++ src/sys/dev/usb/if_otus.c Sun Feb 26 06:28:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_otus.c,v 1.9 2010/12/02 17:38:05 christos Exp $ */
+/* $NetBSD: if_otus.c,v 1.9.14.1 2012/02/26 06:28:58 mrg Exp $ */
/* $OpenBSD: if_otus.c,v 1.18 2010/08/27 17:08:00 jsg Exp $ */
/*-
@@ -31,7 +31,6 @@
#include <sys/callout.h>
#include <sys/device.h>
#include <sys/proc.h>
-
#include <sys/bus.h>
#include <sys/endian.h>
#include <sys/intr.h>
@@ -58,6 +57,7 @@
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/if_otusreg.h>
Index: src/sys/dev/usb/if_upgt.c
diff -u src/sys/dev/usb/if_upgt.c:1.3.14.1 src/sys/dev/usb/if_upgt.c:1.3.14.2
--- src/sys/dev/usb/if_upgt.c:1.3.14.1 Sat Feb 18 07:35:06 2012
+++ src/sys/dev/usb/if_upgt.c Sun Feb 26 06:28:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upgt.c,v 1.3.14.1 2012/02/18 07:35:06 mrg Exp $ */
+/* $NetBSD: if_upgt.c,v 1.3.14.2 2012/02/26 06:28:58 mrg Exp $ */
/* $OpenBSD: if_upgt.c,v 1.49 2010/04/20 22:05:43 tedu Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.3.14.1 2012/02/18 07:35:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.3.14.2 2012/02/26 06:28:58 mrg Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -31,7 +31,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v
#include <sys/sockio.h>
#include <sys/systm.h>
#include <sys/vnode.h>
-
#include <sys/bus.h>
#include <sys/endian.h>
#include <sys/intr.h>
@@ -52,6 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdevs.h>
#include <dev/usb/if_upgtvar.h>
Index: src/sys/dev/usb/udsbr.c
diff -u src/sys/dev/usb/udsbr.c:1.18.12.1 src/sys/dev/usb/udsbr.c:1.18.12.2
--- src/sys/dev/usb/udsbr.c:1.18.12.1 Sat Feb 18 07:35:08 2012
+++ src/sys/dev/usb/udsbr.c Sun Feb 26 06:28:59 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: udsbr.c,v 1.18.12.1 2012/02/18 07:35:08 mrg Exp $ */
+/* $NetBSD: udsbr.c,v 1.18.12.2 2012/02/26 06:28:59 mrg Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.18.12.1 2012/02/18 07:35:08 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.18.12.2 2012/02/26 06:28:59 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,6 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
#include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
#include <dev/usb/usbdevs.h>
