diff options
| author | Marty Connor | 2007-07-02 21:36:19 +0200 |
|---|---|---|
| committer | Marty Connor | 2007-07-02 21:36:19 +0200 |
| commit | 0297a63877f7d45fab0f67786866096a1e3f87f4 (patch) | |
| tree | 65bae097355bb80074d6515bb898a818f93331b4 /src/drivers | |
| parent | Warnings purge (diff) | |
| parent | Add untested support for UNDI transmit and receive. (diff) | |
| download | ipxe-0297a63877f7d45fab0f67786866096a1e3f87f4.tar.gz ipxe-0297a63877f7d45fab0f67786866096a1e3f87f4.tar.xz ipxe-0297a63877f7d45fab0f67786866096a1e3f87f4.zip | |
Merge branch 'master' of ssh://rom.etherboot.org/pub/scm/gpxe
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/bus/isapnp.c | 2 | ||||
| -rw-r--r-- | src/drivers/bus/pci.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/drivers/bus/isapnp.c b/src/drivers/bus/isapnp.c index 96bc60ec9..79268d440 100644 --- a/src/drivers/bus/isapnp.c +++ b/src/drivers/bus/isapnp.c @@ -705,6 +705,8 @@ static int isapnpbus_probe ( struct root_device *rootdev ) { isapnp->dev.desc.bus_type = BUS_TYPE_ISAPNP; isapnp->dev.desc.vendor = isapnp->vendor_id; isapnp->dev.desc.device = isapnp->prod_id; + isapnp->dev.desc.ioaddr = isapnp->ioaddr; + isapnp->dev.desc.irq = isapnp->irqno; isapnp->dev.parent = &rootdev->dev; list_add ( &isapnp->dev.siblings, &rootdev->dev.children ); diff --git a/src/drivers/bus/pci.c b/src/drivers/bus/pci.c index 577691f5e..967441acd 100644 --- a/src/drivers/bus/pci.c +++ b/src/drivers/bus/pci.c @@ -286,6 +286,9 @@ static int pcibus_probe ( struct root_device *rootdev ) { pci->dev.desc.location = PCI_BUSDEVFN (bus, devfn); pci->dev.desc.vendor = pci->vendor; pci->dev.desc.device = pci->device; + pci->dev.desc.class = pci->class; + pci->dev.desc.ioaddr = pci->ioaddr; + pci->dev.desc.irq = pci->irq; pci->dev.parent = &rootdev->dev; list_add ( &pci->dev.siblings, &rootdev->dev.children); INIT_LIST_HEAD ( &pci->dev.children ); |