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/spapr_pci.c | |
| parent | a8a826a3c3b8c8a1c4def0e9e22b46e78e6163a0 (diff) | |
| parent | 1dd3a74d2ee2d873cde0b390b536e45420b3fe05 (diff) | |
Merge commit '1dd3a74d2ee2d873cde0b390b536e45420b3fe05' into HEAD
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/spapr_pci.c')
| -rw-r--r-- | hw/spapr_pci.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c index 3c5b855bc0..786f6f4222 100644 --- a/hw/spapr_pci.c +++ b/hw/spapr_pci.c @@ -23,17 +23,17 @@ * THE SOFTWARE. */ #include "hw.h" -#include "pci.h" -#include "msi.h" -#include "msix.h" -#include "pci_host.h" +#include "pci/pci.h" +#include "pci/msi.h" +#include "pci/msix.h" +#include "pci/pci_host.h" #include "hw/spapr.h" #include "hw/spapr_pci.h" #include "exec-memory.h" #include <libfdt.h> #include "trace.h" -#include "hw/pci_internals.h" +#include "hw/pci/pci_bus.h" /* Copied from the kernel arch/powerpc/platforms/pseries/msi.c */ #define RTAS_QUERY_FN 0 |