From: matthew_minter <matthew_minter@xxxxxxxxxxx> --- arch/cris/arch-v32/drivers/pci/bios.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/arch/cris/arch-v32/drivers/pci/bios.c b/arch/cris/arch-v32/drivers/pci/bios.c index 64a5fb9..d04ecc8 100644 --- a/arch/cris/arch-v32/drivers/pci/bios.c +++ b/arch/cris/arch-v32/drivers/pci/bios.c @@ -80,20 +80,16 @@ int pcibios_enable_resources(struct pci_dev *dev, int mask) return 0; } -int pcibios_enable_irq(struct pci_dev *dev) +int pcibios_enable_irq(struct pci_dev *dev, u8 slot, u8 pin) { dev->irq = EXT_INTR_VECT; return 0; } -int pcibios_enable_device(struct pci_dev *dev, int mask) +int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) { - int err; - - if ((err = pcibios_enable_resources(dev, mask)) < 0) - return err; - - if (!dev->msi_enabled) - pcibios_enable_irq(dev); + bridge->swizzle_irq = NULL; + bridge->map_irq = pcibios_enable_irq; return 0; } + -- 2.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html