exec: move include files to include/exec/

[mirror_qemu.git] / hw / vt82c686.c

diff --git a/hw/vt82c686.c b/hw/vt82c686.c
index 5016e954d336ec88f6a59fac4c40dcfdb2caac7e..edceb5a01d461246a9f072f595e730f1228d4f95 100644 (file)
--- a/hw/vt82c686.c
+++ b/hw/vt82c686.c
@@ -15,7 +15,7 @@
 #include "vt82c686.h"
 #include "i2c.h"
 #include "smbus.h"
-#include "pci.h"
+#include "pci/pci.h"
 #include "isa.h"
 #include "sysbus.h"
 #include "mips.h"
@@ -24,10 +24,10 @@
 #include "pm_smbus.h"
 #include "sysemu.h"
 #include "qemu-timer.h"
-#include "exec-memory.h"
+#include "exec/address-spaces.h"
 
 typedef uint32_t pci_addr_t;
-#include "pci_host.h"
+#include "pci/pci_host.h"
 //#define DEBUG_VT82C686B
 
 #ifdef DEBUG_VT82C686B
@@ -354,7 +354,7 @@ static int vt82c686b_pm_initfn(PCIDevice *dev)
     pm_smbus_init(&s->dev.qdev, &s->smb);
     memory_region_add_subregion(get_system_io(), s->smb_io_base, &s->smb.io);
 
-    apm_init(&s->apm, NULL, s);
+    apm_init(dev, &s->apm, NULL, s);
 
     memory_region_init(&s->io, "vt82c686-pm", 64);
     memory_region_set_enabled(&s->io, false);