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/e1000.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/e1000.c')
| -rw-r--r-- | hw/e1000.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/e1000.c b/hw/e1000.c index ad242981cc..13a459c0eb 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -1192,7 +1192,7 @@ e1000_cleanup(VLANClientState *nc) s->nic = NULL; } -static int +static void pci_e1000_uninit(PCIDevice *dev) { E1000State *d = DO_UPCAST(E1000State, dev, dev); @@ -1202,7 +1202,6 @@ pci_e1000_uninit(PCIDevice *dev) memory_region_destroy(&d->mmio); memory_region_destroy(&d->io); qemu_del_vlan_client(&d->nic->nc); - return 0; } static NetClientInfo net_e1000_info = { |