diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-17 18:17:08 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-17 18:56:22 +0100 |
commit | 6f991980a5e96f93a9f676959df2dcba665665ef (patch) | |
tree | e6f46c0531e8a05b22be4c5adf7f7fb31afa6d13 /hw/ide/core.c | |
parent | a8a826a3c3b8c8a1c4def0e9e22b46e78e6163a0 (diff) | |
parent | 1dd3a74d2ee2d873cde0b390b536e45420b3fe05 (diff) |
Merge commit '1dd3a74d2ee2d873cde0b390b536e45420b3fe05' into HEAD
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/ide/core.c')
-rw-r--r-- | hw/ide/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c index 1235612d95..0e5bc7fe3b 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.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 "qemu-error.h" #include "qemu-timer.h" |