1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index 3bc54b30c3a1..d539d9df88e7 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -287,7 +287,7 @@ DINO_PORT_OUT(b,  8, 3)
 DINO_PORT_OUT(w, 16, 2)
 DINO_PORT_OUT(l, 32, 0)
 
-struct pci_port_ops dino_port_ops = {
+static struct pci_port_ops dino_port_ops = {
         .inb    = dino_in8,
         .inw    = dino_in16,
         .inl    = dino_in32,
@@ -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, 
@@ -690,7 +690,7 @@ dino_fixup_bus(struct pci_bus *bus)
 }
 
 
-struct pci_bios_ops dino_bios_ops = {
+static struct pci_bios_ops dino_bios_ops = {
         .init           = dino_bios_init,
         .fixup_bus      = dino_fixup_bus
 };