diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-03 12:31:30 -0500 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-03 12:31:30 -0500 |
| commit | 9ea0f58fc723daeb9e1dba9a762269e8cbbd1b73 (patch) | |
| tree | 1d985efb12e0e411e8a4cf5c842967897600b8f6 /hw/usb/dev-hid.c | |
| parent | 9889e04ac193cad7fa0526573ce0cc752dcabb99 (diff) | |
| parent | 31efd2e883018b4c079ad082105bc161fbb3fef8 (diff) | |
| download | focaccia-qemu-9ea0f58fc723daeb9e1dba9a762269e8cbbd1b73.tar.gz focaccia-qemu-9ea0f58fc723daeb9e1dba9a762269e8cbbd1b73.zip | |
Merge remote-tracking branch 'kraxel/usb.88' into staging
# By Gerd Hoffmann (10) and Marcel Apfelbaum (1) # Via Gerd Hoffmann * kraxel/usb.88: usb/dev-hid: Modified usb-tablet category from Misc to Input Revert "usb-hub: report status changes only once" usb-hub: add tracepoint for status reports usb: parallelize usb3 streams uas: add property for request logging xhci: reset port when disabling slot xhci: emulate intr endpoint intervals correctly xhci: fix endpoint interval calculation xhci: add port to slot_address tracepoint xhci: add tracepoint for endpoint state changes xhci: remove leftover debug printf Message-id: 1378117055-29620-1-git-send-email-kraxel@redhat.com Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to 'hw/usb/dev-hid.c')
| -rw-r--r-- | hw/usb/dev-hid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c index 66c63317d6..59567200ae 100644 --- a/hw/usb/dev-hid.c +++ b/hw/usb/dev-hid.c @@ -658,7 +658,7 @@ static void usb_tablet_class_initfn(ObjectClass *klass, void *data) uc->product_desc = "QEMU USB Tablet"; dc->vmsd = &vmstate_usb_ptr; dc->props = usb_tablet_properties; - set_bit(DEVICE_CATEGORY_MISC, dc->categories); + set_bit(DEVICE_CATEGORY_INPUT, dc->categories); } static const TypeInfo usb_tablet_info = { |