diff options
| author | Anthony Liguori | 2012-03-13 19:55:02 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2012-03-13 19:55:02 +0100 |
| commit | 684e1e047950938be259e7d02033f44c427e6ba5 (patch) | |
| tree | 67ff0b0f138e9d70bf3f44d1ef47c15dc716fc41 /hw/mips_malta.c | |
| parent | qom: Add QOM support to user emulators (diff) | |
| parent | Endian fix an assertion in usb-msd (diff) | |
| download | qemu-684e1e047950938be259e7d02033f44c427e6ba5.tar.gz qemu-684e1e047950938be259e7d02033f44c427e6ba5.tar.xz 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 'hw/mips_malta.c')
| -rw-r--r-- | hw/mips_malta.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/mips_malta.c b/hw/mips_malta.c index b1563ed2a7..866699dbf0 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -33,7 +33,6 @@ #include "mips.h" #include "mips_cpudevs.h" #include "pci.h" -#include "usb-uhci.h" #include "vmware_vga.h" #include "qemu-char.h" #include "sysemu.h" @@ -965,7 +964,7 @@ void mips_malta_init (ram_addr_t ram_size, isa_bus_irqs(isa_bus, s->i8259); pci_piix4_ide_init(pci_bus, hd, piix4_devfn + 1); - usb_uhci_piix4_init(pci_bus, piix4_devfn + 2); + pci_create_simple(pci_bus, piix4_devfn + 2, "piix4-usb-uhci"); smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100, isa_get_irq(NULL, 9), NULL, 0); /* TODO: Populate SPD eeprom data. */ |