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 /hw/alpha_sys.h | |
| parent | ce008c1f10e9a7bfb0806432b899ac4390b199c3 (diff) | |
| parent | e2854bf3239f57d160cfe5230033110c0c0d2837 (diff) | |
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 'hw/alpha_sys.h')
| -rw-r--r-- | hw/alpha_sys.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/alpha_sys.h b/hw/alpha_sys.h index d54b18f8ed..f9506c69a7 100644 --- a/hw/alpha_sys.h +++ b/hw/alpha_sys.h @@ -8,7 +8,6 @@ #include "ide.h" #include "net.h" #include "pc.h" -#include "usb-ohci.h" #include "irq.h" |