Commit 4a64d56a authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/home/mochel/BK/linux-2.5-linus

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
parents f5435bda 85d20089
......@@ -325,20 +325,16 @@ acpi_pci_irq_enable (
* values override any BIOS-assinged IRQs set during boot.
*/
irq = acpi_pci_irq_lookup(0, dev->bus->number, PCI_SLOT(dev->devfn), pin);
if (irq)
dev->irq = irq;
/*
* If no PRT entry was found and the device wasn't assigned an IRQ
* during boot we'll try to derive an IRQ from the device's parent
* bridge.
* If no PRT entry was found, we'll try to derive an IRQ from the
* device's parent bridge.
*/
if (!dev->irq && dev->bus->self) {
irq = acpi_pci_irq_derive(dev, pin);
if (irq)
dev->irq = irq;
}
if (!irq)
irq = acpi_pci_irq_derive(dev, pin);
if (irq)
dev->irq = irq;
if (!dev->irq) {
printk(KERN_WARNING PREFIX "No IRQ known for interrupt pin %c of device %s\n", ('A' + pin), dev->slot_name);
......
......@@ -806,8 +806,8 @@ qla1280_do_device_init(struct pci_dev *pdev,
struct scsi_qla_host *ha;
struct device_reg *reg;
printk("qla1x160: Initializing ISP12160 on PCI bus %i, dev %i\n",
pdev->bus->number, PCI_SLOT(pdev->devfn));
printk("qla1x160: Initializing ISP12160 on PCI bus %i, dev %i, irq %i\n",
pdev->bus->number, PCI_SLOT(pdev->devfn), pdev->irq);
host = scsi_register(template, sizeof(struct scsi_qla_host));
if (!host) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment