diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2012-07-29 17:03:19 +0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2012-07-29 17:05:35 +0300 |
| commit | 5e59b024351f827f903f98ae522687ea53dc4f23 (patch) | |
| tree | 4996f31e1d7d9e08c04d8bbf018752a71c6cd4c3 /hw/intel-hda.c | |
| parent | 7162ab21fe8e82f924002951cd8e87f69358f8b5 (diff) | |
| parent | 932d4a42afa28829fadf3cbfbb0507cc09aafd8b (diff) | |
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/intel-hda.c')
| -rw-r--r-- | hw/intel-hda.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/intel-hda.c b/hw/intel-hda.c index 31fe1c54f6..127e81888b 100644 --- a/hw/intel-hda.c +++ b/hw/intel-hda.c @@ -1149,13 +1149,12 @@ static int intel_hda_init(PCIDevice *pci) return 0; } -static int intel_hda_exit(PCIDevice *pci) +static void intel_hda_exit(PCIDevice *pci) { IntelHDAState *d = DO_UPCAST(IntelHDAState, pci, pci); msi_uninit(&d->pci); memory_region_destroy(&d->mmio); - return 0; } static int intel_hda_post_load(void *opaque, int version) |