summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/usb/ezload.c4
-rw-r--r--sys/dev/usb/hid.c4
-rw-r--r--sys/dev/usb/hid.h4
-rw-r--r--sys/dev/usb/if_aue.c4
-rw-r--r--sys/dev/usb/if_cue.c4
-rw-r--r--sys/dev/usb/ohcireg.h4
-rw-r--r--sys/dev/usb/uaudio.c4
-rw-r--r--sys/dev/usb/uaudioreg.h4
-rw-r--r--sys/dev/usb/ucom.c4
-rw-r--r--sys/dev/usb/udsbr.c4
-rw-r--r--sys/dev/usb/uftdireg.h4
-rw-r--r--sys/dev/usb/ugen.c4
-rw-r--r--sys/dev/usb/uhid.c4
-rw-r--r--sys/dev/usb/uhidev.c4
-rw-r--r--sys/dev/usb/ulpt.c4
-rw-r--r--sys/dev/usb/umct.c4
-rw-r--r--sys/dev/usb/umidi.c5
-rw-r--r--sys/dev/usb/umidivar.h4
-rw-r--r--sys/dev/usb/umodem.c4
-rw-r--r--sys/dev/usb/ums.c4
-rw-r--r--sys/dev/usb/uplcom.c4
-rw-r--r--sys/dev/usb/urio.c4
-rw-r--r--sys/dev/usb/usb_quirks.c4
-rw-r--r--sys/dev/usb/uscanner.c4
-rw-r--r--sys/dev/usb/uvisor.c4
-rw-r--r--sys/dev/usb/uyap.c4
26 files changed, 52 insertions, 53 deletions
diff --git a/sys/dev/usb/ezload.c b/sys/dev/usb/ezload.c
index 0ea3b9b980e..859ae4a4a92 100644
--- a/sys/dev/usb/ezload.c
+++ b/sys/dev/usb/ezload.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: ezload.c,v 1.5 2002/07/25 02:18:10 nate Exp $ */
-/* $NetBSD: ezload.c,v 1.4 2001/11/13 06:24:53 lukem Exp $ */
+/* $OpenBSD: ezload.c,v 1.6 2002/07/25 04:07:32 nate Exp $ */
+/* $NetBSD: ezload.c,v 1.5 2002/07/11 21:14:25 augustss Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/hid.c b/sys/dev/usb/hid.c
index 2f3823c2687..8dcc38aeea7 100644
--- a/sys/dev/usb/hid.c
+++ b/sys/dev/usb/hid.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: hid.c,v 1.13 2002/07/25 02:18:10 nate Exp $ */
-/* $NetBSD: hid.c,v 1.22 2002/01/12 17:11:03 tsutsui Exp $ */
+/* $OpenBSD: hid.c,v 1.14 2002/07/25 04:07:32 nate Exp $ */
+/* $NetBSD: hid.c,v 1.23 2002/07/11 21:14:25 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/hid.c,v 1.11 1999/11/17 22:33:39 n_hibma Exp $ */
/*
diff --git a/sys/dev/usb/hid.h b/sys/dev/usb/hid.h
index 230c1bcbe85..b81a7559727 100644
--- a/sys/dev/usb/hid.h
+++ b/sys/dev/usb/hid.h
@@ -1,5 +1,5 @@
-/* $OpenBSD: hid.h,v 1.8 2002/07/25 02:18:10 nate Exp $ */
-/* $NetBSD: hid.h,v 1.7 2001/12/28 17:32:36 augustss Exp $ */
+/* $OpenBSD: hid.h,v 1.9 2002/07/25 04:07:32 nate Exp $ */
+/* $NetBSD: hid.h,v 1.8 2002/07/11 21:14:25 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/hid.h,v 1.7 1999/11/17 22:33:40 n_hibma Exp $ */
/*
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 410fd59721c..aeab086359a 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: if_aue.c,v 1.25 2002/07/25 02:18:10 nate Exp $ */
-/* $NetBSD: if_aue.c,v 1.78 2002/07/08 17:46:23 augustss Exp $ */
+/* $OpenBSD: if_aue.c,v 1.26 2002/07/25 04:07:32 nate Exp $ */
+/* $NetBSD: if_aue.c,v 1.79 2002/07/11 21:14:25 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index 91cb154557c..00e1a6067a7 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: if_cue.c,v 1.16 2002/07/25 02:18:10 nate Exp $ */
-/* $NetBSD: if_cue.c,v 1.39 2002/07/08 17:46:24 augustss Exp $ */
+/* $OpenBSD: if_cue.c,v 1.17 2002/07/25 04:07:32 nate Exp $ */
+/* $NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
diff --git a/sys/dev/usb/ohcireg.h b/sys/dev/usb/ohcireg.h
index 0be0ac497c7..cd74f7e85b3 100644
--- a/sys/dev/usb/ohcireg.h
+++ b/sys/dev/usb/ohcireg.h
@@ -1,5 +1,5 @@
-/* $OpenBSD: ohcireg.h,v 1.10 2002/07/25 02:18:10 nate Exp $ */
-/* $NetBSD: ohcireg.h,v 1.18 2000/04/27 15:26:47 augustss Exp $ */
+/* $OpenBSD: ohcireg.h,v 1.11 2002/07/25 04:07:32 nate Exp $ */
+/* $NetBSD: ohcireg.h,v 1.19 2002/07/11 21:14:27 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohcireg.h,v 1.8 1999/11/17 22:33:40 n_hibma Exp $ */
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index 150fc0b8534..1af95547be8 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: uaudio.c,v 1.12 2002/05/06 23:07:26 nate Exp $ */
-/* $NetBSD: uaudio.c,v 1.59 2002/04/20 17:36:16 kent Exp $ */
+/* $OpenBSD: uaudio.c,v 1.13 2002/07/25 04:07:32 nate Exp $ */
+/* $NetBSD: uaudio.c,v 1.60 2002/05/18 15:14:39 kent Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uaudioreg.h b/sys/dev/usb/uaudioreg.h
index 149c968d9cc..46831fdaf9d 100644
--- a/sys/dev/usb/uaudioreg.h
+++ b/sys/dev/usb/uaudioreg.h
@@ -1,5 +1,5 @@
-/* $OpenBSD: uaudioreg.h,v 1.9 2002/07/25 02:18:10 nate Exp $ */
-/* $NetBSD: uaudioreg.h,v 1.8 2002/03/07 14:37:03 kent Exp $ */
+/* $OpenBSD: uaudioreg.h,v 1.10 2002/07/25 04:07:32 nate Exp $ */
+/* $NetBSD: uaudioreg.h,v 1.9 2002/07/11 21:14:27 augustss Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index d548925cf94..71d9ccc16a8 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: ucom.c,v 1.15 2002/07/25 02:18:10 nate Exp $ */
-/* $NetBSD: ucom.c,v 1.42 2002/03/17 19:41:04 atatat Exp $ */
+/* $OpenBSD: ucom.c,v 1.16 2002/07/25 04:07:32 nate Exp $ */
+/* $NetBSD: ucom.c,v 1.43 2002/07/11 21:14:27 augustss Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/udsbr.c b/sys/dev/usb/udsbr.c
index 1d9f0f99a52..08500900a79 100644
--- a/sys/dev/usb/udsbr.c
+++ b/sys/dev/usb/udsbr.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: udsbr.c,v 1.4 2002/07/25 02:18:10 nate Exp $ */
-/* $NetBSD: udsbr.c,v 1.6 2002/02/12 10:51:49 tron Exp $ */
+/* $OpenBSD: udsbr.c,v 1.5 2002/07/25 04:07:32 nate Exp $ */
+/* $NetBSD: udsbr.c,v 1.7 2002/07/11 21:14:27 augustss Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uftdireg.h b/sys/dev/usb/uftdireg.h
index 7f3f8b74e34..3228634d55a 100644
--- a/sys/dev/usb/uftdireg.h
+++ b/sys/dev/usb/uftdireg.h
@@ -1,5 +1,5 @@
-/* $OpenBSD: uftdireg.h,v 1.7 2002/07/25 02:18:10 nate Exp $ */
-/* $NetBSD: uftdireg.h,v 1.5 2002/05/08 18:10:19 scw Exp $ */
+/* $OpenBSD: uftdireg.h,v 1.8 2002/07/25 04:07:32 nate Exp $ */
+/* $NetBSD: uftdireg.h,v 1.6 2002/07/11 21:14:28 augustss Exp $ */
/*
* Definitions for the FTDI USB Single Port Serial Converter -
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 2185251c785..c88c56705e5 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: ugen.c,v 1.24 2002/07/25 02:18:10 nate Exp $ */
-/* $NetBSD: ugen.c,v 1.58 2002/02/20 20:30:12 christos Exp $ */
+/* $OpenBSD: ugen.c,v 1.25 2002/07/25 04:07:32 nate Exp $ */
+/* $NetBSD: ugen.c,v 1.59 2002/07/11 21:14:28 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $ */
/*
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index 6dc30472289..544ed4d6422 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: uhid.c,v 1.22 2002/07/25 02:18:10 nate Exp $ */
-/* $NetBSD: uhid.c,v 1.51 2002/03/17 18:02:53 augustss Exp $ */
+/* $OpenBSD: uhid.c,v 1.23 2002/07/25 04:07:33 nate Exp $ */
+/* $NetBSD: uhid.c,v 1.52 2002/07/11 21:14:29 augustss Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uhidev.c b/sys/dev/usb/uhidev.c
index 3a07d841d46..b2a109a0441 100644
--- a/sys/dev/usb/uhidev.c
+++ b/sys/dev/usb/uhidev.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: uhidev.c,v 1.4 2002/07/25 02:18:10 nate Exp $ */
-/* $NetBSD: uhidev.c,v 1.5 2002/02/27 01:30:50 augustss Exp $ */
+/* $OpenBSD: uhidev.c,v 1.5 2002/07/25 04:07:33 nate Exp $ */
+/* $NetBSD: uhidev.c,v 1.6 2002/07/11 21:14:29 augustss Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 9bef174e627..ea574737d74 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: ulpt.c,v 1.12 2002/07/25 02:18:10 nate Exp $ */
-/* $NetBSD: ulpt.c,v 1.49 2002/02/25 22:39:01 augustss Exp $ */
+/* $OpenBSD: ulpt.c,v 1.13 2002/07/25 04:07:33 nate Exp $ */
+/* $NetBSD: ulpt.c,v 1.50 2002/07/11 21:14:31 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */
/*
diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c
index 541be52c093..02fa939b59f 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/dev/usb/umct.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: umct.c,v 1.4 2002/07/25 02:18:11 nate Exp $ */
-/* $NetBSD: umct.c,v 1.7 2001/12/17 14:19:39 ichiro Exp $ */
+/* $OpenBSD: umct.c,v 1.5 2002/07/25 04:07:33 nate Exp $ */
+/* $NetBSD: umct.c,v 1.8 2002/07/11 21:14:32 augustss Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c
index 8829f586750..fbb40cd1060 100644
--- a/sys/dev/usb/umidi.c
+++ b/sys/dev/usb/umidi.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: umidi.c,v 1.5 2002/07/25 02:18:11 nate Exp $ */
-/* $NetBSD: umidi.c,v 1.15 2002/06/19 13:51:34 tshiozak Exp $ */
+/* $OpenBSD: umidi.c,v 1.6 2002/07/25 04:07:33 nate Exp $ */
+/* $NetBSD: umidi.c,v 1.16 2002/07/11 21:14:32 augustss Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -987,7 +987,6 @@ alloc_all_mididevs(struct umidi_softc *sc, int nmidi)
sc->sc_mididevs = malloc(sizeof(*sc->sc_mididevs)*nmidi,
M_USBDEV, M_WAITOK);
memset(sc->sc_mididevs, 0, sizeof(*sc->sc_mididevs)*nmidi);
-
if (!sc->sc_mididevs)
return USBD_NOMEM;
diff --git a/sys/dev/usb/umidivar.h b/sys/dev/usb/umidivar.h
index 6a766b0a5bb..f0298a2b64e 100644
--- a/sys/dev/usb/umidivar.h
+++ b/sys/dev/usb/umidivar.h
@@ -1,5 +1,5 @@
-/* $OpenBSD: umidivar.h,v 1.4 2002/07/25 02:18:11 nate Exp $ */
-/* $NetBSD: umidivar.h,v 1.3 2001/02/03 18:50:32 tshiozak Exp $ */
+/* $OpenBSD: umidivar.h,v 1.5 2002/07/25 04:07:33 nate Exp $ */
+/* $NetBSD: umidivar.h,v 1.4 2002/07/11 21:14:32 augustss Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index 92ddb986339..03599cfbc0c 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: umodem.c,v 1.11 2002/07/25 02:18:11 nate Exp $ */
-/* $NetBSD: umodem.c,v 1.41 2001/11/13 06:24:56 lukem Exp $ */
+/* $OpenBSD: umodem.c,v 1.12 2002/07/25 04:07:33 nate Exp $ */
+/* $NetBSD: umodem.c,v 1.44 2002/07/11 21:14:33 augustss Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index e557ea387c4..b94eb0b341d 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: ums.c,v 1.10 2002/07/25 02:18:11 nate Exp $ */
-/* $NetBSD: ums.c,v 1.55 2001/12/31 12:15:22 augustss Exp $ */
+/* $OpenBSD: ums.c,v 1.11 2002/07/25 04:07:33 nate Exp $ */
+/* $NetBSD: ums.c,v 1.57 2002/07/11 21:14:33 augustss Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index 5c25c9a9c25..65f9d1d615c 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: uplcom.c,v 1.6 2002/07/25 02:18:11 nate Exp $ */
-/* $NetBSD: uplcom.c,v 1.27 2002/03/16 16:10:19 ichiro Exp $ */
+/* $OpenBSD: uplcom.c,v 1.7 2002/07/25 04:07:33 nate Exp $ */
+/* $NetBSD: uplcom.c,v 1.28 2002/07/11 21:14:33 augustss Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index b923c49a536..2c10b03123b 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: urio.c,v 1.13 2002/07/25 02:18:11 nate Exp $ */
-/* $NetBSD: urio.c,v 1.11 2002/02/11 15:11:49 augustss Exp $ */
+/* $OpenBSD: urio.c,v 1.14 2002/07/25 04:07:33 nate Exp $ */
+/* $NetBSD: urio.c,v 1.12 2002/07/11 21:14:33 augustss Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usb_quirks.c b/sys/dev/usb/usb_quirks.c
index 5556b98b020..1c4adf49fcc 100644
--- a/sys/dev/usb/usb_quirks.c
+++ b/sys/dev/usb/usb_quirks.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: usb_quirks.c,v 1.14 2002/07/25 02:18:11 nate Exp $ */
-/* $NetBSD: usb_quirks.c,v 1.39 2001/11/13 06:24:56 lukem Exp $ */
+/* $OpenBSD: usb_quirks.c,v 1.15 2002/07/25 04:07:33 nate Exp $ */
+/* $NetBSD: usb_quirks.c,v 1.40 2002/07/11 21:14:34 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.13 1999/11/17 22:33:47 n_hibma Exp $ */
/*
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index a057977ba10..54a0ad89a8e 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: uscanner.c,v 1.11 2002/07/25 02:18:11 nate Exp $ */
-/* $NetBSD: uscanner.c,v 1.29 2002/06/18 00:32:30 augustss Exp $ */
+/* $OpenBSD: uscanner.c,v 1.12 2002/07/25 04:07:33 nate Exp $ */
+/* $NetBSD: uscanner.c,v 1.31 2002/07/14 20:53:21 augustss Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c
index f547a35ce82..80932100849 100644
--- a/sys/dev/usb/uvisor.c
+++ b/sys/dev/usb/uvisor.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: uvisor.c,v 1.11 2002/07/25 02:18:11 nate Exp $ */
-/* $NetBSD: uvisor.c,v 1.15 2002/06/16 15:01:31 augustss Exp $ */
+/* $OpenBSD: uvisor.c,v 1.12 2002/07/25 04:07:33 nate Exp $ */
+/* $NetBSD: uvisor.c,v 1.16 2002/07/11 21:14:36 augustss Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/uyap.c b/sys/dev/usb/uyap.c
index 53c1fba9048..b269f375669 100644
--- a/sys/dev/usb/uyap.c
+++ b/sys/dev/usb/uyap.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: uyap.c,v 1.5 2002/07/25 02:18:11 nate Exp $ */
-/* $NetBSD: uyap.c,v 1.5 2001/11/13 06:24:57 lukem Exp $ */
+/* $OpenBSD: uyap.c,v 1.6 2002/07/25 04:07:33 nate Exp $ */
+/* $NetBSD: uyap.c,v 1.6 2002/07/11 21:14:37 augustss Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.