Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/dev/usb/auvitek_video.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/usb/auvitek_video.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.6 retrieving revision 1.6.32.2 diff -u -p -r1.6 -r1.6.32.2 --- src/sys/dev/usb/auvitek_video.c 2011/10/02 19:15:40 1.6 +++ src/sys/dev/usb/auvitek_video.c 2014/12/03 12:52:07 1.6.32.2 @@ -1,4 +1,4 @@ -/* $NetBSD: auvitek_video.c,v 1.6 2011/10/02 19:15:40 jmcneill Exp $ */ +/* $NetBSD: auvitek_video.c,v 1.6.32.2 2014/12/03 12:52:07 skrll Exp $ */ /*- * Copyright (c) 2010 Jared D. McNeill @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: auvitek_video.c,v 1.6 2011/10/02 19:15:40 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: auvitek_video.c,v 1.6.32.2 2014/12/03 12:52:07 skrll Exp $"); #include #include @@ -131,7 +131,7 @@ int auvitek_video_attach(struct auvitek_softc *sc) { snprintf(sc->sc_businfo, sizeof(sc->sc_businfo), "usb:%08x", - sc->sc_udev->cookie.cookie); + sc->sc_udev->ud_cookie.cookie); auvitek_video_rescan(sc, NULL, NULL); @@ -680,7 +680,7 @@ auvitek_isoc_start1(struct auvitek_isoc isoc, isoc->i_frlengths, ax->ax_nframes, - USBD_NO_COPY | USBD_SHORT_XFER_OK, + USBD_SHORT_XFER_OK, auvitek_isoc_intr); err = usbd_transfer(isoc->i_xfer);