aboutsummaryrefslogtreecommitdiff
path: root/hw/usb/Makefile.objs
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-07-18 14:44:27 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-07-18 14:44:27 -0500
commit83199ca43c81e6931e62e133d9e53024108831ed (patch)
tree07df27e92d483ee7cecd028c0207fbd6f9f33503 /hw/usb/Makefile.objs
parentcb5fc67db90d80c5dddbd7be1044cc10ef471974 (diff)
parentafb7a0b85be3a21eccd5ede0a41815b15c300b6b (diff)
Merge remote-tracking branch 'kraxel/usb.57' into staging
* kraxel/usb.57: ehci: improve expire time calculation ehci: implement Interrupt Threshold Control support ehci: raise irq in the frame timer uhci: initialize expire_time when loading v1 vmstate usb: add usb attached scsi emulation scsi: add free_request callback
Diffstat (limited to 'hw/usb/Makefile.objs')
-rw-r--r--hw/usb/Makefile.objs1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index 9c7ddf5cb2..4225136d0f 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -11,3 +11,4 @@ common-obj-y += core.o bus.o desc.o dev-hub.o
common-obj-y += host-$(HOST_USB).o dev-bluetooth.o
common-obj-y += dev-hid.o dev-storage.o dev-wacom.o
common-obj-y += dev-serial.o dev-network.o dev-audio.o
+common-obj-y += dev-uas.o