diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-04-03 16:37:23 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-04-05 16:01:45 +1000 |
| commit | b86756ae76dc5e7ecff3ca52a5842155e6d457de (patch) | |
| tree | 85bb9c798d743589c4011f55401992cadf8c6652 /arch/powerpc/platforms/chrp/pci.c | |
| parent | 7d01c880856bae31502095bc68784c1518a680cb (diff) | |
| download | linux-b86756ae76dc5e7ecff3ca52a5842155e6d457de.tar.gz linux-b86756ae76dc5e7ecff3ca52a5842155e6d457de.tar.bz2 linux-b86756ae76dc5e7ecff3ca52a5842155e6d457de.zip | |
powerpc: Fix CHRP booting - needs a define_machine call
The patch removing _machine and converting platforms over to use
define_machine wasn't complete as far as CHRP was concerned. This
adds the define_machine call for CHRP and gets it booting again.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/chrp/pci.c')
| -rw-r--r-- | arch/powerpc/platforms/chrp/pci.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c index 8ef279ad36ad..ac224876ce59 100644 --- a/arch/powerpc/platforms/chrp/pci.c +++ b/arch/powerpc/platforms/chrp/pci.c @@ -23,6 +23,8 @@ #include <asm/grackle.h> #include <asm/rtas.h> +#include "chrp.h" + /* LongTrail */ void __iomem *gg2_pci_config_base; @@ -314,6 +316,6 @@ chrp_find_bridges(void) } /* Do not fixup interrupts from OF tree on pegasos */ - if (is_pegasos == 0) - ppc_md.pcibios_fixup = chrp_pcibios_fixup; + if (is_pegasos) + ppc_md.pcibios_fixup = NULL; } |