diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-21 09:39:17 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-21 09:39:17 -0600 |
| commit | 70aa41b56ce3f34fceac44e828ba2d8cc19523ee (patch) | |
| tree | 360b9559d0ed7faa747da79e5ae2958e933cb785 /default-configs/sh4-softmmu.mak | |
| parent | 259dc0c1ce8eef14e5e0c349bc68ba05c9d5d82f (diff) | |
| parent | 89a453d4a5c195e6d0a3c3d4fcaacb447447115f (diff) | |
Merge remote-tracking branch 'kraxel/usb.78' into staging
# By Gerd Hoffmann
# Via Gerd Hoffmann
* kraxel/usb.78:
uas-uas: usb3 streams
usb-xhci: usb3 streams
usb-core: usb3 streams
usb: fix endpoint descriptor ordering
usb-redir: simplify packet copy
usb: make usb_packet_copy operate on combined packets
usb: add usb_ep_set_halted
usb-host: remove usb_host_device_close
usb-host: move legacy cmd line bits
usb-storage: use scsi_req_enqueue return value
allow disabling usb smartcard support
make usb devices configurable
fix scripts/make_device_config.sh
usb: Makefile cleanup
Diffstat (limited to 'default-configs/sh4-softmmu.mak')
| -rw-r--r-- | default-configs/sh4-softmmu.mak | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak index 5c69acc5f5..e08b2ee106 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -1,6 +1,7 @@ # Default configuration for sh4-softmmu include pci.mak +include usb.mak CONFIG_SERIAL=y CONFIG_PTIMER=y CONFIG_PFLASH_CFI02=y |