aboutsummaryrefslogtreecommitdiff
path: root/hw/pc.h
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2010-07-06 08:31:43 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2010-07-06 08:31:43 -0500
commit734003e6153b3552b9406ef598a1e67aac4a899e (patch)
tree9e4b225de8915dfecaec15356f085f9cb36057f7 /hw/pc.h
parent02d0ba1420803562109185f47be6f7430bfdefae (diff)
parentde189a1b4a471d37a2909e97646654fc9751b52f (diff)
Merge remote branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'hw/pc.h')
-rw-r--r--hw/pc.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/pc.h b/hw/pc.h
index ccfd7add99..63b0249f2f 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -104,7 +104,8 @@ void pc_init_ne2k_isa(NICInfo *nd);
void pc_audio_init (PCIBus *pci_bus, qemu_irq *pic);
#endif
void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
- const char *boot_device, DriveInfo **hd_table,
+ const char *boot_device,
+ BusState *ide0, BusState *ide1,
FDCtrl *floppy_controller, ISADevice *s);
void pc_pci_device_init(PCIBus *pci_bus);