Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (98 commits)
  PCI PM: Put PM callbacks in the order of execution
  PCI PM: Run default PM callbacks for all devices using new framework
  PCI PM: Register power state of devices during initialization
  PCI PM: Call pci_fixup_device from legacy routines
  PCI PM: Rearrange code in pci-driver.c
  PCI PM: Avoid touching devices behind bridges in unknown state
  PCI PM: Move pci_has_legacy_pm_support
  PCI PM: Power-manage devices without drivers during suspend-resume
  PCI PM: Add suspend counterpart of pci_reenable_device
  PCI PM: Fix poweroff and restore callbacks
  PCI: Use msleep instead of cpu_relax during ASPM link retraining
  PCI: PCIe portdrv: Add kerneldoc comments to remining core funtions
  PCI: PCIe portdrv: Rearrange code so that related things are together
  PCI: PCIe portdrv: Fix suspend and resume of PCI Express port services
  PCI: PCIe portdrv: Add kerneldoc comments to some core functions
  x86/PCI: Do not use interrupt links for devices using MSI-X
  net: sfc: Use pci_clear_master() to disable bus mastering
  PCI: Add pci_clear_master() as opposite of pci_set_master()
  PCI hotplug: remove redundant test in cpq hotplug
  PCI: pciehp: cleanup register and field definitions
  ...

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index 3bc54b30c3a1..77cc8bfef8c9 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -547,7 +547,7 @@ dino_card_fixup(struct pci_dev *dev)
         ** The additional "-1" adjusts for skewing the IRQ<->slot.
         */
         dino_cfg_read(dev->bus, dev->devfn, PCI_INTERRUPT_PIN, 1, &irq_pin); 
-        dev->irq = (irq_pin + PCI_SLOT(dev->devfn) - 1) % 4 ;
+        dev->irq = pci_swizzle_interrupt_pin(dev, irq_pin) - 1;
 
         /* Shouldn't really need to do this but it's in case someone tries
         ** to bypass PCI services and look at the card themselves.
@@ -672,7 +672,7 @@ dino_fixup_bus(struct pci_bus *bus)
                         
                         dino_cfg_read(dev->bus, dev->devfn, 
                                       PCI_INTERRUPT_PIN, 1, &irq_pin);
-                        irq_pin = (irq_pin + PCI_SLOT(dev->devfn) - 1) % 4 ;
+                        irq_pin = pci_swizzle_interrupt_pin(dev, irq_pin) - 1;
                         printk(KERN_WARNING "Device %s has undefined IRQ, "
                                         "setting to %d\n", pci_name(dev), irq_pin);
                         dino_cfg_write(dev->bus, dev->devfn,