diff options
| author | Michael S. Tsirkin | 2012-07-29 16:03:19 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2012-07-29 16:05:35 +0200 |
| commit | 5e59b024351f827f903f98ae522687ea53dc4f23 (patch) | |
| tree | 4996f31e1d7d9e08c04d8bbf018752a71c6cd4c3 /hw/ide/ich.c | |
| parent | x86: Fixed incorrect segment base address addition in 64-bits mode (diff) | |
| parent | msi/msix: added API to set MSI message address and data (diff) | |
| download | qemu-5e59b024351f827f903f98ae522687ea53dc4f23.tar.gz qemu-5e59b024351f827f903f98ae522687ea53dc4f23.tar.xz qemu-5e59b024351f827f903f98ae522687ea53dc4f23.zip | |
Merge branch pci into master
Merge master and pci branch, resolve build breakage in hw/esp.c
introduced by f90c2bcd.
Conflicts:
hw/esp.c
Diffstat (limited to 'hw/ide/ich.c')
| -rw-r--r-- | hw/ide/ich.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/ide/ich.c b/hw/ide/ich.c index 319bc2bb10..272b7734b5 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -132,15 +132,13 @@ static int pci_ich9_ahci_init(PCIDevice *dev) return 0; } -static int pci_ich9_uninit(PCIDevice *dev) +static void pci_ich9_uninit(PCIDevice *dev) { struct AHCIPCIState *d; d = DO_UPCAST(struct AHCIPCIState, card, dev); msi_uninit(dev); ahci_uninit(&d->ahci); - - return 0; } static void ich_ahci_class_init(ObjectClass *klass, void *data) |