diff options
author | Blue Swirl <blauwirbel@gmail.com> | 2012-12-08 14:28:13 +0000 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2012-12-08 14:28:13 +0000 |
commit | 4cdd2e665ec4bd10c20c26432ee9ffe4db7bcc1c (patch) | |
tree | a764e6ea07f06acf51df4d62790cdf9ae922d55d /hw/lpc_ich9.c | |
parent | 475363176c80feedb8feb5e335ba64de68c7b055 (diff) | |
parent | 582299336879504353e60c7937fbc70fea93f3da (diff) | |
download | hqemu-4cdd2e665ec4bd10c20c26432ee9ffe4db7bcc1c.zip hqemu-4cdd2e665ec4bd10c20c26432ee9ffe4db7bcc1c.tar.gz |
Merge branch 'memory-ioport' of git://github.com/afaerber/qemu-cpu
* 'memory-ioport' of git://github.com/afaerber/qemu-cpu:
hw/dma.c: Replace register_ioport_*
hw/pc.c: Replace register_ioport_*
serial: Replace register_ioport_*
hw/cirrus_vga.c: Replace register_ioport_*
hw/apm.c: Replace register_ioport_*
isa: Add isa_address_space_io()
Diffstat (limited to 'hw/lpc_ich9.c')
-rw-r--r-- | hw/lpc_ich9.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/lpc_ich9.c b/hw/lpc_ich9.c index 2fc83a4..7de5427 100644 --- a/hw/lpc_ich9.c +++ b/hw/lpc_ich9.c @@ -472,7 +472,7 @@ static int ich9_lpc_initfn(PCIDevice *d) lpc->isa_bus = isa_bus; ich9_cc_init(lpc); - apm_init(&lpc->apm, ich9_apm_ctrl_changed, lpc); + apm_init(d, &lpc->apm, ich9_apm_ctrl_changed, lpc); return 0; } |