public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Kumar Gala <galak@kernel.crashing.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] ppc/85xx: Fix inclusion of 83xx immap in 85xx builds
Date: Wed,  4 Nov 2009 18:03:34 -0600	[thread overview]
Message-ID: <1257379414-16527-1-git-send-email-galak@kernel.crashing.org> (raw)

The nand_boot_fsl_elbc.c is shared between 83xx & 85xx however we should
not be including the immap_83xx.h when building 85xx.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 nand_spl/nand_boot_fsl_elbc.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/nand_spl/nand_boot_fsl_elbc.c b/nand_spl/nand_boot_fsl_elbc.c
index 7f14a6f..1d79f11 100644
--- a/nand_spl/nand_boot_fsl_elbc.c
+++ b/nand_spl/nand_boot_fsl_elbc.c
@@ -25,7 +25,12 @@
 
 #include <common.h>
 #include <asm/io.h>
+#ifdef CONFIG_MPC83xx
 #include <asm/immap_83xx.h>
+#endif
+#ifdef CONFIG_MPC85xx
+#include <asm/immap_85xx.h>
+#endif
 #include <asm/fsl_lbc.h>
 #include <linux/mtd/nand.h>
 
-- 
1.6.0.6

             reply	other threads:[~2009-11-05  0:03 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-05  0:03 Kumar Gala [this message]
2009-11-05  0:07 ` [U-Boot] [PATCH] ppc/85xx: Fix inclusion of 83xx immap in 85xx builds Kumar Gala
2009-11-05  0:09 ` Peter Tyser

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1257379414-16527-1-git-send-email-galak@kernel.crashing.org \
    --to=galak@kernel.crashing.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox