diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-06-14 10:33:36 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-06-14 10:33:36 -0500 |
| commit | a4673e276248ada38f40d39191a197e7e35d3f8b (patch) | |
| tree | 4ecdac95fb7bb86eefc08ee38ca229c4d89e02e0 /hw/ide/cmd646.c | |
| parent | a2da0395c12bd2b26e2180d735c83988ff66a559 (diff) | |
| parent | 653dbec7c97cb51d19636423902719e5850da265 (diff) | |
| download | qemu-a4673e276248ada38f40d39191a197e7e35d3f8b.tar.gz | |
Merge remote branch 'kwolf/for-anthony' into staging
Conflicts:
hw/pc.c
Diffstat (limited to 'hw/ide/cmd646.c')
| -rw-r--r-- | hw/ide/cmd646.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index cdcc9bf1aa..559147ff43 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -260,8 +260,8 @@ static int pci_cmd646_ide_initfn(PCIDevice *dev) irq = qemu_allocate_irqs(cmd646_set_irq, d, 2); ide_bus_new(&d->bus[0], &d->dev.qdev); ide_bus_new(&d->bus[1], &d->dev.qdev); - ide_init2(&d->bus[0], NULL, NULL, irq[0]); - ide_init2(&d->bus[1], NULL, NULL, irq[1]); + ide_init2(&d->bus[0], irq[0]); + ide_init2(&d->bus[1], irq[1]); vmstate_register(0, &vmstate_ide_pci, d); qemu_register_reset(cmd646_reset, d); |