aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mn10300/unit-asb2305/pci.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mn10300/unit-asb2305/pci.c')
-rw-r--r--arch/mn10300/unit-asb2305/pci.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mn10300/unit-asb2305/pci.c b/arch/mn10300/unit-asb2305/pci.c
index 082590f5af15..02527ce10cb2 100644
--- a/arch/mn10300/unit-asb2305/pci.c
+++ b/arch/mn10300/unit-asb2305/pci.c
@@ -440,7 +440,7 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
440{ 440{
441 int err; 441 int err;
442 442
443 err = pcibios_enable_resources(dev, mask); 443 err = pci_enable_resources(dev, mask);
444 if (err == 0) 444 if (err == 0)
445 pcibios_enable_irq(dev); 445 pcibios_enable_irq(dev);
446 return err; 446 return err;
@@ -455,6 +455,7 @@ static void __init unit_disable_pcnet(struct pci_bus *bus, struct pci_ops *o)
455 455
456 bus->number = 0; 456 bus->number = 0;
457 457
458 o->read (bus, PCI_DEVFN(2, 0), PCI_VENDOR_ID, 4, &x);
458 o->read (bus, PCI_DEVFN(2, 0), PCI_COMMAND, 2, &x); 459 o->read (bus, PCI_DEVFN(2, 0), PCI_COMMAND, 2, &x);
459 x |= PCI_COMMAND_MASTER | 460 x |= PCI_COMMAND_MASTER |
460 PCI_COMMAND_IO | PCI_COMMAND_MEMORY | 461 PCI_COMMAND_IO | PCI_COMMAND_MEMORY |