[Qemu-devel] [PULL 5/6] usb: add config options for hub and hid devices (kbd, mouse, tablet).

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden
---
 default-configs/usb.mak | 2 ++
 hw/usb/Makefile.objs    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/default-configs/usb.mak b/default-configs/usb.mak
index e42cfeabbe..3ee117dbf6 100644
--- a/default-configs/usb.mak
+++ b/default-configs/usb.mak
@@ -1,4 +1,6 @@
 CONFIG_USB=y
+CONFIG_USB_HUB=y
+CONFIG_USB_HID=y
 CONFIG_USB_TABLET_WACOM=y
 CONFIG_USB_STORAGE_BOT=y
 CONFIG_USB_STORAGE_UAS=y
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index 41be700812..c8802aaefd 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -15,8 +15,8 @@ obj-$(CONFIG_TUSB6010) += tusb6010.o
 obj-$(CONFIG_IMX)      += chipidea.o
 
 # emulated usb devices
-common-obj-$(CONFIG_USB) += dev-hub.o
-common-obj-$(CONFIG_USB) += dev-hid.o
+common-obj-$(CONFIG_USB_HUB) += dev-hub.o
+common-obj-$(CONFIG_USB_HID) += dev-hid.o
 common-obj-$(CONFIG_USB_TABLET_WACOM) += dev-wacom.o
 common-obj-$(CONFIG_USB_STORAGE_BOT)  += dev-storage.o
 common-obj-$(CONFIG_USB_STORAGE_UAS)  += dev-uas.o
-- 
2.9.3