diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-13 13:55:02 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-13 13:55:02 -0500 |
| commit | 684e1e047950938be259e7d02033f44c427e6ba5 (patch) | |
| tree | 67ff0b0f138e9d70bf3f44d1ef47c15dc716fc41 /Makefile.target | |
| parent | ce008c1f10e9a7bfb0806432b899ac4390b199c3 (diff) | |
| parent | e2854bf3239f57d160cfe5230033110c0c0d2837 (diff) | |
| download | qemu-684e1e047950938be259e7d02033f44c427e6ba5.tar.gz qemu-684e1e047950938be259e7d02033f44c427e6ba5.tar.bz2 qemu-684e1e047950938be259e7d02033f44c427e6ba5.zip | |
Merge remote-tracking branch 'kraxel/usb.44' into staging
* kraxel/usb.44:
Endian fix an assertion in usb-msd
uhci: alloc can't fail, drop check.
uhci: new uhci_handle_td return code for tds still in flight
uhci: renumber uhci_handle_td return codes
uhci: use enum for uhci_handle_td return codes
uhci: tracing support
uhci: cancel on schedule stop.
uhci: fix uhci_async_cancel_all
uhci: pass addr to uhci_async_alloc
usb: improve packet state sanity checks
usb-ohci: DMA writeback bug fixes
usb-ehci: drop unused isoch_pause variable
usb: zap hw/ush-{ohic,uhci}.h + init wrappers
usb: the big rename
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target index cb1532ac53..eb2594188a 100644 --- a/Makefile.target +++ b/Makefile.target @@ -373,7 +373,7 @@ obj-arm-y += omap1.o omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o \ obj-arm-y += omap2.o omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \ omap_gpmc.o omap_sdrc.o omap_spi.o omap_tap.o omap_l4.o obj-arm-y += omap_sx1.o palm.o tsc210x.o -obj-arm-y += nseries.o blizzard.o onenand.o cbus.o tusb6010.o usb-musb.o +obj-arm-y += nseries.o blizzard.o onenand.o cbus.o tusb6010.o usb/hcd-musb.o obj-arm-y += mst_fpga.o mainstone.o obj-arm-y += z2.o obj-arm-y += musicpal.o bitbang_i2c.o marvell_88w8618_audio.o |