From patchwork Mon Jan 7 09:36:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Gang X-Patchwork-Id: 1940241 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 61AEEDF230 for ; Mon, 7 Jan 2013 09:38:56 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Ts97j-0007Yu-Ds; Mon, 07 Jan 2013 09:36:03 +0000 Received: from intranet.asianux.com ([58.214.24.6]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Ts97e-0007Xy-Q3 for linux-arm-kernel@lists.infradead.org; Mon, 07 Jan 2013 09:36:00 +0000 Received: by intranet.asianux.com (Postfix, from userid 103) id 39D861840309; Mon, 7 Jan 2013 17:35:51 +0800 (CST) X-Spam-Score: -100.8 X-Spam-Checker-Version: SpamAssassin 3.1.9 (2007-02-13) on intranet.asianux.com X-Spam-Level: X-Spam-Status: No, score=-100.8 required=5.0 tests=AWL,BAYES_00, RATWARE_GECKO_BUILD,USER_IN_WHITELIST autolearn=no version=3.1.9 Received: from [10.1.0.143] (unknown [219.143.36.82]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by intranet.asianux.com (Postfix) with ESMTP id B6EE31840241; Mon, 7 Jan 2013 17:35:50 +0800 (CST) Message-ID: <50EA972E.3040404@asianux.com> Date: Mon, 07 Jan 2013 17:36:46 +0800 From: Chen Gang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: kgene.kim@samsung.com, linux@arm.linux.org.uk Subject: [PATCH] arch/arm/mach-s5pv210: adding ifdef CONFIG_CPU_S5PV210 to fix compiling issue X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130107_043559_186614_EF27CD05 X-CRM114-Status: GOOD ( 12.58 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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 --- 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..ad56485 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 */ @@ -222,6 +227,8 @@ void __init s5pv210_init_irq(void) s5p_init_irq(vic, ARRAY_SIZE(vic)); } +#ifdef CONFIG_CPU_S5PV210 + struct bus_type s5pv210_subsys = { .name = "s5pv210-core", .dev_name = "s5pv210-core", @@ -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 */