diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-19 22:45:37 +0000 |
| commit | 6d403070f28cd44860fdb3a53be5da0275c65cf4 (patch) | |
| tree | 0d0e7fe7b5fb7568d19e11d7d862b77a866ce081 /drivers/char/rocket.c | |
| parent | ecf1bf5f6c2e668d03b0a9fb026db7aa41e292e1 (diff) | |
Merge with 2.4.0-test1-ac21 + pile of MIPS cleanups to make merging
possible. Chainsawed RM200 kernel to compile again. Jazz machine
status unknown.
Diffstat (limited to 'drivers/char/rocket.c')
| -rw-r--r-- | drivers/char/rocket.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c index 29d4227ff..943ea6a61 100644 --- a/drivers/char/rocket.c +++ b/drivers/char/rocket.c @@ -1957,7 +1957,10 @@ int __init register_PCI(int i, unsigned int bus, unsigned int device_fn) if (!dev) return 0; - rcktpt_io_addr[i] = dev->resource[0].start; + if (pci_enable_device(dev)) + return 0; + + rcktpt_io_addr[i] = pci_resource_start (dev, 0); switch(dev->device) { case PCI_DEVICE_ID_RP4QUAD: str = "Quadcable"; |