Merge tag 'nfs-for-3.6-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[deliverable/linux.git] / drivers / parisc / iosapic.c

diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c
index 1f9e9fefb8e7d97f21516b0541beaf0206f366a8..9544cdc0d1af120098466ca63d814acfa28957ef 100644 (file)
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
@@ -146,7 +146,7 @@
 #endif
 
 #include <asm/ropes.h>
-#include "./iosapic_private.h"
+#include "iosapic_private.h"
 
 #define MODULE_NAME "iosapic"
 
@@ -532,7 +532,7 @@ iosapic_xlate_pin(struct iosapic_info *isi, struct pci_dev *pcidev)
                intr_slot = PCI_SLOT(pcidev->devfn);
        }
        DBG_IRT("iosapic_xlate_pin:  bus %d slot %d pin %d\n",
-                               pcidev->bus->secondary, intr_slot, intr_pin);
+                       pcidev->bus->busn_res.start, intr_slot, intr_pin);
 
        return irt_find_irqline(isi, intr_slot, intr_pin);
 }