1c1
< /* $FreeBSD: head/sys/dev/usb2/core/usb2_busdma.c 184610 2008-11-04 02:31:03Z alfred $ */
---
> /* $FreeBSD: head/sys/dev/usb2/core/usb2_busdma.c 184824 2008-11-10 20:54:31Z thompsa $ */
26a27,31
> #include <dev/usb2/include/usb2_mfunc.h>
> #include <dev/usb2/include/usb2_error.h>
> #include <dev/usb2/include/usb2_standard.h>
> #include <dev/usb2/include/usb2_defs.h>
>
30a36
> #include <dev/usb2/core/usb2_device.h>
33,35c39,40
< #include <dev/usb2/include/usb2_mfunc.h>
< #include <dev/usb2/include/usb2_error.h>
< #include <dev/usb2/include/usb2_standard.h>
---
> #include <dev/usb2/controller/usb2_controller.h>
> #include <dev/usb2/controller/usb2_bus.h>
1199c1204
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
1201c1206
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);
1273c1278
< mtx_lock(xfer->usb2_mtx);
---
> USB_BUS_LOCK(xfer->udev->bus);
1275c1280
< mtx_unlock(xfer->usb2_mtx);
---
> USB_BUS_UNLOCK(xfer->udev->bus);