aboutsummaryrefslogtreecommitdiff
path: root/hw/pcnet-pci.c
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2012-07-29 17:03:19 +0300
committerMichael S. Tsirkin <mst@redhat.com>2012-07-29 17:05:35 +0300
commit5e59b024351f827f903f98ae522687ea53dc4f23 (patch)
tree4996f31e1d7d9e08c04d8bbf018752a71c6cd4c3 /hw/pcnet-pci.c
parent7162ab21fe8e82f924002951cd8e87f69358f8b5 (diff)
parent932d4a42afa28829fadf3cbfbb0507cc09aafd8b (diff)
downloadqemu-5e59b024351f827f903f98ae522687ea53dc4f23.zip
qemu-5e59b024351f827f903f98ae522687ea53dc4f23.tar.gz
qemu-5e59b024351f827f903f98ae522687ea53dc4f23.tar.bz2
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/pcnet-pci.c')
-rw-r--r--hw/pcnet-pci.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c
index 931fedd..31eb1a8 100644
--- a/hw/pcnet-pci.c
+++ b/hw/pcnet-pci.c
@@ -271,7 +271,7 @@ static void pci_pcnet_cleanup(VLANClientState *nc)
pcnet_common_cleanup(d);
}
-static int pci_pcnet_uninit(PCIDevice *dev)
+static void pci_pcnet_uninit(PCIDevice *dev)
{
PCIPCNetState *d = DO_UPCAST(PCIPCNetState, pci_dev, dev);
@@ -280,7 +280,6 @@ static int pci_pcnet_uninit(PCIDevice *dev)
qemu_del_timer(d->state.poll_timer);
qemu_free_timer(d->state.poll_timer);
qemu_del_vlan_client(&d->state.nic->nc);
- return 0;
}
static NetClientInfo net_pci_pcnet_info = {