diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-06-13 15:15:03 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-06-13 15:15:03 +0100 |
| commit | 2c96c379ac7a22424c25d65b73e81b860f902868 (patch) | |
| tree | cba7cba9fcf3464ebff66430a70ba5f2ada4bbdc /include | |
| parent | 55e5c3a2d2433bd2e1e635a7ba395f1c70341794 (diff) | |
| parent | 4bcbe0b63661b1df8e78d58270574d818b387d2c (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160613-1' into staging
usb: misc fixes.
# gpg: Signature made Mon 13 Jun 2016 14:09:15 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/pull-usb-20160613-1:
vl: Eliminate usb_enabled()
pxa2xx: Unconditionally enable USB controller
hw/usb/dev-network.c: Use ldl_le_p() and stl_le_p()
usb-host: add special case for bus+addr
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sysemu/sysemu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 94281413d0..7313673b66 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -233,7 +233,6 @@ void qemu_boot_set(const char *boot_order, Error **errp); QemuOpts *qemu_get_machine_opts(void); bool defaults_enabled(void); -bool usb_enabled(void); extern QemuOptsList qemu_legacy_drive_opts; extern QemuOptsList qemu_common_drive_opts; |