tree 91a3fec9a0e74c6262facf33b1409a7ae25d8558
parent 81cc117d4f6b7a55b47c9edbeeb5a1c3c3e1b920
author Leigh Brown <[EMAIL PROTECTED]> Tue Apr 12 08:24:59 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:24:59 2005
[PATCH] ppc32: Make the Powerstack II Pro4000 boot again
This patch restores the original behaviour of prep_pcibios_fixup() to only
call prep_pib_init() on machines with an openpic. This allows the
Powerstack II Pro4000 to boot again.
Signed-off-by: Leigh Brown <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
prep_pci.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
Index: arch/ppc/platforms/prep_pci.c
===================================================================
--- 8a1ddaae3e9f33ea1df5035abfde82780889cd6c/arch/ppc/platforms/prep_pci.c
(mode:100644 sha1:92727371314627770ad51b78a09c126e02ebecc5)
+++ 91a3fec9a0e74c6262facf33b1409a7ae25d8558/arch/ppc/platforms/prep_pci.c
(mode:100644 sha1:5e7e1996f359b27e006271398d7bd3ff1e1210c6)
@@ -1245,8 +1245,13 @@
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
}
- /* Setup the Winbond or Via PIB */
- prep_pib_init();
+ /* Setup the Winbond or Via PIB - prep_pib_init() is coded for
+ * the non-openpic case, but it breaks (at least) the Utah
+ * (Powerstack II Pro4000), so only call it if we have an
+ * openpic.
+ */
+ if (have_openpic)
+ prep_pib_init();
}
static void __init
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
