From patchwork Tue Mar 12 16:46:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2257251 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 906583FCF6 for ; Tue, 12 Mar 2013 16:51:46 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UFSNU-0004R1-Cr; Tue, 12 Mar 2013 16:48:40 +0000 Received: from moutng.kundenserver.de ([212.227.17.10]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UFSLm-00041J-Oq for linux-arm-kernel@lists.infradead.org; Tue, 12 Mar 2013 16:47:03 +0000 Received: from wuerfel.lan (HSI-KBW-46-223-90-92.hsi.kabel-badenwuerttemberg.de [46.223.90.92]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0M7av1-1Uzyp80DVX-00x0Mt; Tue, 12 Mar 2013 17:46:53 +0100 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 12/13] ARM: spear: fix build error in restart.c Date: Tue, 12 Mar 2013 17:46:55 +0100 Message-Id: <1363106816-9603-13-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1363106816-9603-1-git-send-email-arnd@arndb.de> References: <1363106816-9603-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:UmNaMEg81t/rYGuEMLMihGHuizSj9xpcPWO9F5d++wZ c1qfwutS3lZ8YWqC/i19Yp3CczayAaUJoGmnUdkyeY/SY/poBG 4B+qkchHOhMBxnEYz1aoP3iobdOcWRJYPFXfNQ12Um84Dj9O8W ORzT532g8RJkS3UGTGVQV8Ar+DDWRbcWwT9j+9DpmINIZyPVHK RqyGthZv75jJ7YdocgTAoEuwOkl/BSBX7caNuC86X39aLSHX/t TJ2cfdIN/st0l4iNNh4/iATQC7sOZX+UdtKPXCBCpMQvwM3qXB IIcMYuxQt7AAeqbth5Gv4yJ2bCW+o69F2Y8Lsls/boSNQq8zB9 1Pf6b+UH3NbOboqWWMBhmTx2Qp2HmRFFxrlPT5rSA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130312_124655_235741_4D94676F X-CRM114-Status: UNSURE ( 8.40 ) 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.17.10 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: vipulkumar.samar@st.com, spear-devel@list.st.com, Arnd Bergmann 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org We can now enable mach-spear without selecting any of the machines in a multiplatform configuration. Doing so causes a build error that is trivial to fix by making both the spear13xx and the spear3xx/6xx portion of this file conditional rather than alternatives. Signed-off-by: Arnd Bergmann Acked-by: Viresh Kumar --- arch/arm/mach-spear/restart.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-spear/restart.c b/arch/arm/mach-spear/restart.c index 004f0f2..2b44500 100644 --- a/arch/arm/mach-spear/restart.c +++ b/arch/arm/mach-spear/restart.c @@ -26,7 +26,8 @@ void spear_restart(char mode, const char *cmd) /* hardware reset, Use on-chip reset capability */ #ifdef CONFIG_ARCH_SPEAR13XX writel_relaxed(0x01, SPEAR13XX_SYS_SW_RES); -#else +#endif +#if defined(CONFIG_ARCH_SPEAR3XX) || defined(CONFIG_ARCH_SPEAR6XX) sysctl_soft_reset((void __iomem *)VA_SPEAR_SYS_CTRL_BASE); #endif }