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/pci_bridge.h | |
| 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/pci_bridge.h')
| -rw-r--r-- | hw/pci_bridge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/pci_bridge.h b/hw/pci_bridge.h index 84411a69dc..a00accc172 100644 --- a/hw/pci_bridge.h +++ b/hw/pci_bridge.h @@ -44,7 +44,7 @@ void pci_bridge_reset_reg(PCIDevice *dev); void pci_bridge_reset(DeviceState *qdev); int pci_bridge_initfn(PCIDevice *pci_dev); -int pci_bridge_exitfn(PCIDevice *pci_dev); +void pci_bridge_exitfn(PCIDevice *pci_dev); /* |