diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2011-06-14 17:51:11 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2011-06-15 18:27:15 +0300 |
| commit | befeac45d4d9afb587eca9a27d975db4a7950960 (patch) | |
| tree | aab24c856a3ea944e287d7f2591bb4bab6a56eb4 /usb-bsd.c | |
| parent | 35f754620615138aaae0ef72602f84c88fd8de0f (diff) | |
| parent | 0b862cedf36d927818c50584ddd611b0370673df (diff) | |
| download | qemu-befeac45d4d9afb587eca9a27d975db4a7950960.tar.gz | |
Merge remote-tracking branch 'origin/master' into pci
Conflicts:
hw/virtio-pci.c
Diffstat (limited to 'usb-bsd.c')
| -rw-r--r-- | usb-bsd.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -39,7 +39,6 @@ #else #include <bus/usb/usb.h> #endif -#include <signal.h> /* This value has maximum potential at 16. * You should also set hw.usb.debug to gain @@ -126,6 +125,7 @@ static void usb_host_handle_reset(USBDevice *dev) * and return appropriate response */ static int usb_host_handle_control(USBDevice *dev, + USBPacket *p, int request, int value, int index, |