diff options
| author | Peter Maydell | 2017-07-19 14:43:58 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-07-19 14:43:58 +0200 |
| commit | 6d60e295ef020759a03b90724d0342012c189ba2 (patch) | |
| tree | a50bcfd74adef238653a7927f6d9c4873225b81e /hw/ide/ich.c | |
| parent | Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170718' i... (diff) | |
| parent | tests/ahci-test: Be mean with RAM (diff) | |
| download | qemu-6d60e295ef020759a03b90724d0342012c189ba2.tar.gz qemu-6d60e295ef020759a03b90724d0342012c189ba2.tar.xz qemu-6d60e295ef020759a03b90724d0342012c189ba2.zip | |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Tue 18 Jul 2017 17:11:07 BST
# gpg: using RSA key 0x7DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
# Primary key fingerprint: FAEB 9711 A12C F475 812F 18F2 88A9 064D 1835 61EB
# Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76 CBD0 7DEF 8106 AAFC 390E
* remotes/jnsnow/tags/ide-pull-request:
tests/ahci-test: Be mean with RAM
ahci: split public and private interface
ahci: Isolate public AHCI interface
ahci: add ahci_get_num_ports
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/ide/ich.c')
| -rw-r--r-- | hw/ide/ich.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ide/ich.c b/hw/ide/ich.c index 989fca5e9f..9472a60cab 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -69,7 +69,7 @@ #include "sysemu/block-backend.h" #include "sysemu/dma.h" #include "hw/ide/pci.h" -#include "hw/ide/ahci.h" +#include "hw/ide/ahci_internal.h" #define ICH9_MSI_CAP_OFFSET 0x80 #define ICH9_SATA_CAP_OFFSET 0xA8 |