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/ppc_newworld.c | |
| 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/ppc_newworld.c')
| -rw-r--r-- | hw/ppc_newworld.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c index 506187b182..2fec5b4d67 100644 --- a/hw/ppc_newworld.c +++ b/hw/ppc_newworld.c @@ -54,7 +54,6 @@ #include "nvram.h" #include "pc.h" #include "pci.h" -#include "usb-ohci.h" #include "net.h" #include "sysemu.h" #include "boards.h" @@ -352,7 +351,7 @@ static void ppc_core99_init (ram_addr_t ram_size, dbdma_mem, cuda_mem, NULL, 3, ide_mem, escc_bar); if (usb_enabled) { - usb_ohci_init_pci(pci_bus, -1); + pci_create_simple(pci_bus, -1, "pci-ohci"); } /* U3 needs to use USB for input because Linux doesn't support via-cuda |