diff options
| author | Leigh Brown <leigh@solinno.co.uk> | 2005-04-17 00:24:26 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-17 00:24:26 +0200 |
| commit | b625a2b85221821b6831a387ee23ff7d93ffb7d1 (patch) | |
| tree | 76becda481719bf1544dedd9563efd4de3329678 /arch/ppc/platforms | |
| parent | [PATCH] ppc32: Fix building 32bit kernel for 64bit machines (diff) | |
| download | linux-b625a2b85221821b6831a387ee23ff7d93ffb7d1.tar.xz linux-b625a2b85221821b6831a387ee23ff7d93ffb7d1.zip | |
[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 <leigh@solinno.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc/platforms')
| -rw-r--r-- | arch/ppc/platforms/prep_pci.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/ppc/platforms/prep_pci.c b/arch/ppc/platforms/prep_pci.c index 8cd80eb447bd..4760cb64251d 100644 --- a/arch/ppc/platforms/prep_pci.c +++ b/arch/ppc/platforms/prep_pci.c @@ -1245,8 +1245,13 @@ prep_pcibios_fixup(void) 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 |