aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosef Karthauser <joe@FreeBSD.org>2003-07-14 20:31:03 +0000
committerJosef Karthauser <joe@FreeBSD.org>2003-07-14 20:31:03 +0000
commit094fb32de713fcda6d330b650460890783f1a6a8 (patch)
tree5af1a249b3fd83f9349397398bc402bde072e100
parentfc71f32c53c90a2bc215f94ad861a7a8da98dad0 (diff)
downloadsrc-094fb32de713fcda6d330b650460890783f1a6a8.tar.gz
src-094fb32de713fcda6d330b650460890783f1a6a8.zip
Update to reflect the NetBSD patches that are already included.
Notes
Notes: svn path=/head/; revision=117594
-rw-r--r--sys/dev/usb/usb_subr.c7
-rw-r--r--sys/dev/usb/usbdi.c5
-rw-r--r--sys/dev/usb/usbdi.h2
-rw-r--r--sys/dev/usb/usbdivar.h2
4 files changed, 13 insertions, 3 deletions
diff --git a/sys/dev/usb/usb_subr.c b/sys/dev/usb/usb_subr.c
index f1ff29b47ada..a78fb5dd1a8e 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/dev/usb/usb_subr.c
@@ -1,6 +1,11 @@
-/* $NetBSD: usb_subr.c,v 1.98 2002/02/20 20:30:13 christos Exp $ */
+/* $NetBSD: usb_subr.c,v 1.99 2002/07/11 21:14:34 augustss Exp $ */
/* $FreeBSD$ */
+/* Also already have from NetBSD:
+ * $NetBSD: usb_subr.c,v 1.102 2003/01/01 16:21:50 augustss Exp $
+ * $NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $
+ */
+
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index 5991fd6e2a99..cb83d1604c78 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -1,6 +1,11 @@
/* $NetBSD: usbdi.c,v 1.100 2002/05/19 06:24:33 augustss Exp $ */
/* $FreeBSD$ */
+/* Also already have from NetBSD:
+ * $NetBSD: usbdi.c,v 1.102 2002/07/11 21:14:35 augustss Exp $
+ * $NetBSD: usbdi.c,v 1.103 2002/09/27 15:37:38 provos Exp $
+ */
+
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h
index 07dd4ee63645..146f8caa878f 100644
--- a/sys/dev/usb/usbdi.h
+++ b/sys/dev/usb/usbdi.h
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.h,v 1.60 2002/02/11 15:11:49 augustss Exp $ */
+/* $NetBSD: usbdi.h,v 1.62 2002/07/11 21:14:35 augustss Exp $ */
/* $FreeBSD$ */
/*
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index 9a3deddf3555..0054780a61ad 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdivar.h,v 1.69 2001/12/27 18:43:46 augustss Exp $ */
+/* $NetBSD: usbdivar.h,v 1.70 2002/07/11 21:14:36 augustss Exp $ */
/* $FreeBSD$ */
/*