From patchwork Mon Jun 3 22:05:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2655371 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id 5395D3FC23 for ; Mon, 3 Jun 2013 22:05:43 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UjcsM-000875-Al; Mon, 03 Jun 2013 22:05:14 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UjcsJ-0004cu-IQ; Mon, 03 Jun 2013 22:05:11 +0000 Received: from moutng.kundenserver.de ([212.227.126.187]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UjcsG-0004bl-Lu for linux-arm-kernel@lists.infradead.org; Mon, 03 Jun 2013 22:05:09 +0000 Received: from wuerfel.localnet (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mreu3) with ESMTP (Nemesis) id 0LzzIW-1UOwgV2goO-00uK9m; Tue, 04 Jun 2013 00:04:47 +0200 From: Arnd Bergmann To: Mike Turquette Subject: [PATCH] clk: spear: fix build error for spear3xx Date: Tue, 04 Jun 2013 00:05:07 +0200 Message-ID: <2592841.P0ZcyhdZJA@wuerfel> User-Agent: KMail/4.10.2 (Linux/3.10.0-rc3-next-20130527+; KDE/4.10.3; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V02:K0:k1Ynh+bMBHIAw5Tlri56NqLt8+ZMQXgtKWTCuhUFBd9 XOcXBqmKNx+lliMXUtrDwScKFrXnShvNcDvDx225U6Xuejjp6C l8gHRYzUkN+9Kj7MvWqpv36ZbxQtyy2aZgGzqCGJHaAqwEai76 uq8WFLBjjjNjvkkM7BiNYby88nov54lbVg2nfR6yfohesqsJLx WVRhysfoimBYY8v6b4YRFJ9qqqtaC3sC4qRMIdS0NnBgWMKyPx /XSAedvJIpesC3ZC1qp/MbGZCNVwbvNobn4R59ZhdXStBI/KDB 81QGyROXH8Hs6+frkJ0/Usc7aowwGRD9vI0TJ/MHPi8r0SiuUe H0VZaSjNHEnmYJCExcwM= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130603_180508_969767_42472997 X-CRM114-Status: UNSURE ( 6.18 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.187 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Viresh Kumar , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This patch is required to be able to disable spear320 support after the spear320_clk_init() prototype changed for the real function but not for the dummy. Signed-off-by: Arnd Bergmann Acked-by: Viresh Kumar diff --git a/drivers/clk/spear/spear3xx_clock.c b/drivers/clk/spear/spear3xx_clock.c index f9ec43f..080c3c5 100644 --- a/drivers/clk/spear/spear3xx_clock.c +++ b/drivers/clk/spear/spear3xx_clock.c @@ -369,7 +369,7 @@ static void __init spear320_clk_init(void __iomem *soc_config_base) clk_register_clkdev(clk, NULL, "60100000.serial"); } #else -static inline void spear320_clk_init(void) { } +static inline void spear320_clk_init(void __iomem *soc_config_base) { } #endif void __init spear3xx_clk_init(void __iomem *misc_base, void __iomem *soc_config_base)