[IA64] Manual merge fix for 3 files

[linux-2.6] / arch / sparc64 / kernel / pci_schizo.c

diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c
index f4f68e150d747c6953b8f53f9f595d3a0c4e0951..6a182bb66281f24c0caf721207c5f9370323fd4e 100644 (file)
--- a/arch/sparc64/kernel/pci_schizo.c
+++ b/arch/sparc64/kernel/pci_schizo.c
@@ -1936,9 +1936,7 @@ static void __init schizo_pbm_hw_init(struct pci_pbm_info *pbm)
 {
        u64 tmp;
 
-       /* Set IRQ retry to infinity. */
-       schizo_write(pbm->pbm_regs + SCHIZO_PCI_IRQ_RETRY,
-                    SCHIZO_IRQ_RETRY_INF);
+       schizo_write(pbm->pbm_regs + SCHIZO_PCI_IRQ_RETRY, 5);
 
        tmp = schizo_read(pbm->pbm_regs + SCHIZO_PCI_CTRL);