diff --git a/[refs] b/[refs] index d3cef8de8083..e122cc005505 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca4aa09635516258f158a7bc1594a794e4c34864 +refs/heads/master: 7da5d406792eedb5341a8c20296470b2e67743e7 diff --git a/trunk/arch/i386/pci/irq.c b/trunk/arch/i386/pci/irq.c index 47f02af74be3..dbc4aae91959 100644 --- a/trunk/arch/i386/pci/irq.c +++ b/trunk/arch/i386/pci/irq.c @@ -1141,10 +1141,6 @@ static int pirq_enable_irq(struct pci_dev *dev) } dev = temp_dev; if (irq >= 0) { -#ifdef CONFIG_PCI_MSI - if (!platform_legacy_irq(irq)) - irq = IO_APIC_VECTOR(irq); -#endif printk(KERN_INFO "PCI->APIC IRQ transform: %s[%c] -> IRQ %d\n", pci_name(dev), 'A' + pin, irq); dev->irq = irq;