diff options
author | Eric Biederman <ebiederm@xmission.com> | 2004-10-16 06:20:29 +0000 |
---|---|---|
committer | Eric Biederman <ebiederm@xmission.com> | 2004-10-16 06:20:29 +0000 |
commit | 7003ba4a88a847707c55d593e517eaa70fc8c63d (patch) | |
tree | ad29fcd2fde474cb9bdd32835a76101edabe1ef9 /src/devices/pci_device.c | |
parent | 216525d1fd86c13e0f1ebe85ba518cdc1da06fcb (diff) |
- First stab at running linuxbios without the old static device tree.
Things are close but not quite there yet.
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1681 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/devices/pci_device.c')
-rw-r--r-- | src/devices/pci_device.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/devices/pci_device.c b/src/devices/pci_device.c index 5d72f03ccd..a7b2ff3e89 100644 --- a/src/devices/pci_device.c +++ b/src/devices/pci_device.c @@ -18,7 +18,6 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> -#include <device/chip.h> #include <part/hard_reset.h> #include <part/fallback_boot.h> #include <delay.h> @@ -486,7 +485,7 @@ void pci_dev_enable_resources(struct device *dev) /* Set the subsystem vendor and device id for mainboard devices */ ops = ops_pci(dev); - if (dev->chip && ops && ops->set_subsystem) { + if (dev->chip_ops && ops && ops->set_subsystem) { printk_debug("%s subsystem <- %02x/%02x\n", dev_path(dev), MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID, @@ -740,10 +739,9 @@ unsigned int pci_scan_bus(struct bus *bus, * it may be absent and enable_dev must cope. * */ - if ( dev->chip && dev->chip->control && - dev->chip->control->enable_dev) + if (dev->chip_ops && dev->chip_ops->enable_dev) { - dev->chip->control->enable_dev(dev); + dev->chip_ops->enable_dev(dev); } /* Now read the vendor and device id */ id = pci_read_config32(dev, PCI_VENDOR_ID); |