Commit b625a2b8 authored by Leigh Brown's avatar Leigh Brown Committed by Linus Torvalds

[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: default avatarLeigh Brown <leigh@solinno.co.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ef2f3253
...@@ -1245,8 +1245,13 @@ prep_pcibios_fixup(void) ...@@ -1245,8 +1245,13 @@ prep_pcibios_fixup(void)
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq); pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
} }
/* Setup the Winbond or Via PIB */ /* Setup the Winbond or Via PIB - prep_pib_init() is coded for
prep_pib_init(); * 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 static void __init
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment