From: Ian Jackson <ian@davenant.greenend.org.uk>
Date: Fri, 30 May 2008 16:25:53 +0000 (+0100)
Subject: No need to call pci_e100_init since it's pci_i8255*_init in upstream
X-Git-Tag: xen-3.3.0-rc1~140
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a59b0b8a9bf9d8834c4bf7cd85999304f40e082a;p=qemu-xen-4.4-testing.git

No need to call pci_e100_init since it's pci_i8255*_init in upstream
---

diff --git a/hw/pci.c b/hw/pci.c
index a86e966b1..9d5b7d7b6 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -639,8 +639,6 @@ void pci_nic_init(PCIBus *bus, NICInfo *nd, int devfn)
         pci_i82559er_init(bus, nd, devfn);
     } else if (strcmp(nd->model, "rtl8139") == 0) {
         pci_rtl8139_init(bus, nd, devfn);
-    } else if (strcmp(nd->model, "e100") == 0) {
-        pci_e100_init(bus, nd);
     } else if (strcmp(nd->model, "e1000") == 0) {
         pci_e1000_init(bus, nd, devfn);
     } else if (strcmp(nd->model, "pcnet") == 0) {