From patchwork Fri Mar 22 21:35:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 2322961 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 BBAEFDFE82 for ; Fri, 22 Mar 2013 21:39:01 +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 1UJ9ck-0001KN-FB; Fri, 22 Mar 2013 21:35:42 +0000 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UJ9ch-0001Jr-78 for linux-arm-kernel@lists.infradead.org; Fri, 22 Mar 2013 21:35:39 +0000 Received: from [2001:470:1f08:1539:9535:520b:eb30:917a] (helo=deadeye.wl.decadent.org.uk) by shadbolt.decadent.org.uk with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1UJ9cY-0006VN-It; Fri, 22 Mar 2013 21:35:30 +0000 Received: from ben by deadeye.wl.decadent.org.uk with local (Exim 4.80) (envelope-from ) id 1UJ9cW-00030b-Kz; Fri, 22 Mar 2013 21:35:28 +0000 Message-ID: <1363988123.3728.45.camel@deadeye.wl.decadent.org.uk> Subject: [PATCH] ARM: autcpu12: Fix config check in autcpu12_init_late() From: Ben Hutchings To: Russell King Date: Fri, 22 Mar 2013 21:35:23 +0000 X-Mailer: Evolution 3.4.4-2 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 2001:470:1f08:1539:9535:520b:eb30:917a X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130322_173539_432820_CDB6549B X-CRM114-Status: GOOD ( 13.38 ) X-Spam-Score: -5.1 (-----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-5.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [88.96.1.126 listed in list.dnswl.org] -2.5 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: Olof Johansson , linux-arm-kernel@lists.infradead.org, Alexander Shiyan 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 The 'CONFIG_' prefix is not implicit in IS_ENABLED(). Signed-off-by: Ben Hutchings Cc: Alexander Shiyan Cc: Olof Johansson Cc: Paul Bolle Cc: # 3.8+ --- Found by inspection. This is not even compile-tested. Ben. arch/arm/mach-clps711x/board-autcpu12.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-clps711x/board-autcpu12.c b/arch/arm/mach-clps711x/board-autcpu12.c index f385847..8138523 100644 --- a/arch/arm/mach-clps711x/board-autcpu12.c +++ b/arch/arm/mach-clps711x/board-autcpu12.c @@ -158,7 +158,8 @@ static void __init autcpu12_init(void) static void __init autcpu12_init_late(void) { - if (IS_ENABLED(MTD_NAND_GPIO) && IS_ENABLED(GPIO_GENERIC_PLATFORM)) { + if (IS_ENABLED(CONFIG_MTD_NAND_GPIO) && + IS_ENABLED(CONFIG_GPIO_GENERIC_PLATFORM)) { /* We are need both drivers to handle NAND */ platform_device_register(&autcpu12_nand_pdev); }