From: gang.chen@asianux.com (Chen Gang)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] arch/arm/mach-s5pv210: adding ifdef CONFIG_CPU_S5PV210 to fix compiling issue
Date: Mon, 07 Jan 2013 20:31:18 +0800 [thread overview]
Message-ID: <50EAC016.6090707@asianux.com> (raw)
In-Reply-To: <50EA972E.3040404@asianux.com>
if not define CONFIG_CPU_S5PV210
it will define NULL in common.h for:
s5pv210_map_io, s5pv210_init_clocks, s5pv210_init, s5pv210_init_uarts
so need using #ifdef CONFIG_CPU_S5PV210 for them too, in common.c.
or compiling issue will occur.
Signed-off-by: Chen Gang <gang.chen@asianux.com>
---
arch/arm/mach-s5pv210/common.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm/mach-s5pv210/common.c b/arch/arm/mach-s5pv210/common.c
index 9dfe93e..5c88f88 100644
--- a/arch/arm/mach-s5pv210/common.c
+++ b/arch/arm/mach-s5pv210/common.c
@@ -167,6 +167,8 @@ void __init s5pv210_init_io(struct map_desc *mach_desc, int size)
s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
}
+#ifdef CONFIG_CPU_S5PV210
+
void __init s5pv210_map_io(void)
{
/* initialise device information early */
@@ -209,6 +211,9 @@ void __init s5pv210_init_clocks(int xtal)
s5pv210_setup_clocks();
}
+#endif /* CONFIG_CPU_S5PV210 */
+
+
void __init s5pv210_init_irq(void)
{
u32 vic[4]; /* S5PV210 supports 4 VIC */
@@ -227,6 +232,8 @@ struct bus_type s5pv210_subsys = {
.dev_name = "s5pv210-core",
};
+#ifdef CONFIG_CPU_S5PV210
+
static struct device s5pv210_dev = {
.bus = &s5pv210_subsys,
};
@@ -249,3 +256,5 @@ void __init s5pv210_init_uarts(struct s3c2410_uartcfg *cfg, int no)
{
s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no);
}
+
+#endif /* CONFIG_CPU_S5PV210 */
--
1.7.10.4
next prev parent reply other threads:[~2013-01-07 12:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-07 9:36 [PATCH] arch/arm/mach-s5pv210: adding ifdef CONFIG_CPU_S5PV210 to fix compiling issue Chen Gang
2013-01-07 12:02 ` Chen Gang
2013-01-07 12:31 ` Chen Gang [this message]
2013-01-15 10:02 ` [PATCH v2] " Chen Gang
2013-01-18 0:14 ` Kukjin Kim
[not found] ` <20130118011846.3CEE21840258@intranet.asianux.com>
2013-01-18 3:33 ` [PATCH v2] arch/arm/mach-s5pv210: adding ifdef CONFIG_CPU_S5PV210to " Kukjin Kim
2013-01-18 13:47 ` Chen Gang
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=50EAC016.6090707@asianux.com \
--to=gang.chen@asianux.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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