From: Kalle Pokki <kalle.pokki@iki.fi>
To: linuxppc-embedded@ozlabs.org, Paul Mackerras <paulus@samba.org>,
Vitaly Bordug <vbordug@ru.mvista.com>
Subject: [PATCH] 8xx: Fixed compile error
Date: Thu, 26 Oct 2006 16:33:53 +0300 (EEST) [thread overview]
Message-ID: <Pine.LNX.4.64.0610261630390.2243@host32.eke.fi> (raw)
Compilation fails in case of CONFIG_MTD_PARTITIONS && !CONFIG_MTD_PHYSMAP.
Also put board-specific definitions inside #ifdef.
Signed-off-by: Kalle Pokki <kalle.pokki@iki.fi>
---
arch/ppc/syslib/m8xx_setup.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/ppc/syslib/m8xx_setup.c b/arch/ppc/syslib/m8xx_setup.c
index 54303a7..7d3bf66 100644
--- a/arch/ppc/syslib/m8xx_setup.c
+++ b/arch/ppc/syslib/m8xx_setup.c
@@ -31,12 +31,10 @@ #include <linux/bootmem.h>
#include <linux/seq_file.h>
#include <linux/root_dev.h>
-#if defined(CONFIG_MTD) && defined(CONFIG_MTD_PHYSMAP)
#include <linux/mtd/partitions.h>
#include <linux/mtd/physmap.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
-#endif
#include <asm/mmu.h>
#include <asm/reg.h>
@@ -53,6 +51,7 @@ #include <asm/ppc_sys.h>
#include "ppc8xx_pic.h"
+#if defined (CONFIG_MPC86XADS) || defined (CONFIG_MPC885ADS)
#ifdef CONFIG_MTD_PHYSMAP
#define MPC8xxADS_BANK_WIDTH 4
#endif
@@ -79,7 +78,8 @@ static struct mtd_partition mpc8xxads_pa
#define mpc8xxads_part_num (sizeof (mpc8xxads_partitions) / sizeof (mpc8xxads_partitions[0]))
-#endif
+#endif /* CONFIG_MTD_PARTITIONS */
+#endif /* CONFIG_MPC86XADS || CONFIG_MPC855ADS */
static int m8xx_set_rtc_time(unsigned long time);
static unsigned long m8xx_get_rtc_time(void);
--
1.4.1.1
reply other threads:[~2006-10-26 13:39 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=Pine.LNX.4.64.0610261630390.2243@host32.eke.fi \
--to=kalle.pokki@iki.fi \
--cc=linuxppc-embedded@ozlabs.org \
--cc=paulus@samba.org \
--cc=vbordug@ru.mvista.com \
/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