Merge branch 'pci/msi'

  - don't set up INTx if MSI or MSI-X is enabled to align cris, frv, ia64,
    and mn10300 with x86 (Bjorn Helgaas)

* pci/msi:
  PCI/MSI: Don't set up INTx if MSI or MSI-X is enabled

diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index f5ec736100ee6a6a036b6b5b3fa024125aa43154..7ccc64d5fe3ee09e3243cd54c9f7fc81985ef539 100644 (file)
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -398,7 +398,7 @@ pcibios_enable_device (struct pci_dev *dev, int mask)
        if (ret < 0)
                return ret;
 
-       if (!dev->msi_enabled)
+       if (!pci_dev_msi_enabled(dev))
                return acpi_pci_irq_enable(dev);
        return 0;
 }
@@ -407,7 +407,7 @@ void
 pcibios_disable_device (struct pci_dev *dev)
 {
        BUG_ON(atomic_read(&dev->enable_cnt));
-       if (!dev->msi_enabled)
+       if (!pci_dev_msi_enabled(dev))
                acpi_pci_irq_disable(dev);
 }