summaryrefslogtreecommitdiff
path: root/Makefile.objs
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2011-07-22 09:23:49 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2011-07-22 09:23:49 -0500
commitcfe7bb19d2e717c4ad763879515a8b8bd1ca19c5 (patch)
treeda73de15e4b762ade6b4c398b3d6c07ea681f4d9 /Makefile.objs
parentbf1cd9b4f54c8f630291dcd057c3aa293a510bcb (diff)
parent69354a83346da2d4d8eb9cda18b639794566c902 (diff)
downloadqemu-cfe7bb19d2e717c4ad763879515a8b8bd1ca19c5.tar.gz
Merge remote-tracking branch 'kraxel/usb.21' into staging
Diffstat (limited to 'Makefile.objs')
-rw-r--r--Makefile.objs1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.objs b/Makefile.objs
index c43ed05c89..a82974bf9a 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -205,6 +205,7 @@ hw-obj-$(CONFIG_HPET) += hpet.o
hw-obj-$(CONFIG_APPLESMC) += applesmc.o
hw-obj-$(CONFIG_SMARTCARD) += usb-ccid.o ccid-card-passthru.o
hw-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o
+hw-obj-$(CONFIG_USB_REDIR) += usb-redir.o
# PPC devices
hw-obj-$(CONFIG_OPENPIC) += openpic.o