diff options
author | Paolo Bonzini | 2012-12-17 18:17:08 +0100 |
---|---|---|
committer | Paolo Bonzini | 2012-12-17 18:56:22 +0100 |
commit | 6f991980a5e96f93a9f676959df2dcba665665ef (patch) | |
tree | e6f46c0531e8a05b22be4c5adf7f7fb31afa6d13 /hw/ide/cmd646.c | |
parent | exec: refactor cpu_restore_state (diff) | |
parent | kvm: do not flush after deleting gsi (diff) | |
download | qemu-6f991980a5e96f93a9f676959df2dcba665665ef.tar.gz qemu-6f991980a5e96f93a9f676959df2dcba665665ef.tar.xz qemu-6f991980a5e96f93a9f676959df2dcba665665ef.zip |
Merge commit '1dd3a74d2ee2d873cde0b390b536e45420b3fe05' into HEAD
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/ide/cmd646.c')
-rw-r--r-- | hw/ide/cmd646.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 804db60ffe..88210eabc8 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -24,7 +24,7 @@ */ #include <hw/hw.h> #include <hw/pc.h> -#include <hw/pci.h> +#include <hw/pci/pci.h> #include <hw/isa.h> #include "block.h" #include "sysemu.h" |