Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

[linux-2.6-omap-h63xx.git] / arch / alpha / kernel / sys_sable.c

diff --git a/arch/alpha/kernel/sys_sable.c b/arch/alpha/kernel/sys_sable.c
index a4555f497639fa0c68e7da3e0284ce221005cee9..d232e42be018ba13cf61522377785c4e5947ec28 100644 (file)
--- a/arch/alpha/kernel/sys_sable.c
+++ b/arch/alpha/kernel/sys_sable.c
@@ -425,7 +425,7 @@ lynx_swizzle(struct pci_dev *dev, u8 *pinp)
                                slot = PCI_SLOT(dev->devfn) + 11;
                                break;
                        }
-                       pin = bridge_swizzle(pin, PCI_SLOT(dev->devfn)) ;
+                       pin = pci_swizzle_interrupt_pin(dev, pin);
 
                        /* Move up the chain of bridges.  */
                        dev = dev->bus->self;