diff options
| author | joe <joe@FreeBSD.org> | 2003-07-14 18:42:58 +0000 |
|---|---|---|
| committer | joe <joe@FreeBSD.org> | 2003-07-14 18:42:58 +0000 |
| commit | 029aca07beb7c19e5f708e6380869798ff422cae (patch) | |
| tree | 6758c84a30b3b5b24845ac98ab5092a43f483bbd /sys/dev/usb/uhci.c | |
| parent | e817a13b0c83f36aff53ea58500d6378d8e3d51e (diff) | |
| download | FreeBSD-src-029aca07beb7c19e5f708e6380869798ff422cae.zip FreeBSD-src-029aca07beb7c19e5f708e6380869798ff422cae.tar.gz | |
Make a note of which patches we already have incorporated from NetBSD.
Diffstat (limited to 'sys/dev/usb/uhci.c')
| -rw-r--r-- | sys/dev/usb/uhci.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index a076427..0351d44 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -2,6 +2,11 @@ /* $FreeBSD$ */ /* Also incorporated from NetBSD: 1.165, 1.166 + * $NetBSD: uhci.c,v 1.162 2002/07/11 21:14:28 augustss Exp $ + * $NetBSD: uhci.c,v 1.163 2002/09/27 15:37:36 provos Exp $ + * $NetBSD: uhci.c,v 1.164 2002/09/29 21:13:01 augustss Exp $ + * $NetBSD: uhci.c,v 1.165 2002/12/31 02:04:49 dsainty Exp $ + * $NetBSD: uhci.c,v 1.166 2002/12/31 02:21:31 dsainty Exp $ * $NetBSD: uhci.c,v 1.167 2003/01/01 16:25:59 augustss Exp $ * $NetBSD: uhci.c,v 1.168 2003/02/08 03:32:51 ichiro Exp $ */ @@ -3075,7 +3080,7 @@ uhci_portreset(uhci_softc_t *sc, int index) DPRINTFN(1,("uhci port %d reset timed out\n", index)); return (USBD_TIMEOUT); } - + sc->sc_isreset = 1; return (USBD_NORMAL_COMPLETION); } |
