Commit 5e1c40de authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net/davem/net-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 3f84dc4d 28908331
...@@ -1030,7 +1030,7 @@ int pirq_enable_irq(struct pci_dev *dev) ...@@ -1030,7 +1030,7 @@ int pirq_enable_irq(struct pci_dev *dev)
/* VIA bridges use interrupt line for apic/pci steering across /* VIA bridges use interrupt line for apic/pci steering across
the V-Link */ the V-Link */
else if (interrupt_line_quirk) else if (interrupt_line_quirk)
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq); pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq & 15);
return 0; return 0;
} }
......
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