Message ID | 1311285022-15925-1-git-send-email-galak@kernel.crashing.org |
---|---|
State | Accepted |
Commit | 70bfb032ec592c99f78791305641b22f85fb52db |
Delegated to: | Kumar Gala |
Headers | show |
On Jul 21, 2011, at 4:50 PM, Kumar Gala wrote: > Had a typo in the ifdef for 85xx, should be CONFIG_MPC85xx for it to get > triggered. Was pull in the non-BookE magic number. > > Reported-by: John Cortell > Signed-off-by: Kumar Gala <galak@kernel.crashing.org> > --- > arch/powerpc/lib/bootm.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) applied to 85xx - k
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index e01787d..5702b0c 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -87,7 +87,7 @@ static void boot_jump_linux(bootm_headers_t *images) * r8: 0 * r9: 0 */ -#if defined(CONFIG_85xx) || defined(CONFIG_440) +#if defined(CONFIG_MPC85xx) || defined(CONFIG_440) #define EPAPR_MAGIC (0x45504150) #else #define EPAPR_MAGIC (0x65504150)
Had a typo in the ifdef for 85xx, should be CONFIG_MPC85xx for it to get triggered. Was pull in the non-BookE magic number. Reported-by: John Cortell Signed-off-by: Kumar Gala <galak@kernel.crashing.org> --- arch/powerpc/lib/bootm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)