tree 76becda481719bf1544dedd9563efd4de3329678
parent ef2f3253f061cbb86da25411a6e6e6a69a84b6ac
author Leigh Brown <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:26 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:26 -0700
[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]>
ppc/platforms/prep_pci.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
Index: arch/ppc/platforms/prep_pci.c
===================================================================
--- 4cc7f6529b1a50a862c8b5c02c05a1ca0a371714/arch/ppc/platforms/prep_pci.c
(mode:100644 sha1:8cd80eb447bd4e694c9a9c16a5a62f96f328a3fa)
+++ 76becda481719bf1544dedd9563efd4de3329678/arch/ppc/platforms/prep_pci.c
(mode:100644 sha1:4760cb64251d4cb705ec46f917125e680711237d)
@@ -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
