From patchwork Tue Oct 1 04:13:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 2968231 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 13144BFF0B for ; Tue, 1 Oct 2013 04:15:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1FBD120377 for ; Tue, 1 Oct 2013 04:15:02 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EA4A220375 for ; Tue, 1 Oct 2013 04:15:00 +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 1VQrMG-0000Zv-ID; Tue, 01 Oct 2013 04:14:48 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VQrME-0007Rw-2B; Tue, 01 Oct 2013 04:14:46 +0000 Received: from mail-out.m-online.net ([2001:a60:0:28:0:1:25:1]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VQrM9-0007Qh-J9 for linux-arm-kernel@lists.infradead.org; Tue, 01 Oct 2013 04:14:43 +0000 Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3cpnDL0HSBz3hlr1; Tue, 1 Oct 2013 06:14:10 +0200 (CEST) X-Auth-Info: 7TLyud5xp4AZlHsOhjCDIElxFJqvTMYdhgc+EPdB8wU= Received: from chi.lan (unknown [195.140.253.167]) by smtp-auth.mnet-online.de (Postfix) with ESMTPA id 3cpnDK66cJzbbgQ; Tue, 1 Oct 2013 06:14:09 +0200 (CEST) From: Marek Vasut To: stable@vger.kernel.org Subject: ARM: mxs: stub out mxs_pm_init for !CONFIG_PM Date: Tue, 1 Oct 2013 06:13:50 +0200 Message-Id: <1380600830-6204-1-git-send-email-marex@denx.de> X-Mailer: git-send-email 1.8.4.rc3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131001_001441_923673_CC4ED4D2 X-CRM114-Status: UNSURE ( 5.48 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: Shawn Guo , Arnd Bergmann , 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Arnd Bergmann When building a kernel without CONFIG_PM, we get a link error from referencing mxs_pm_init in the machine descriptor. This defines a macro to NULL for that case. Upstream commit: 7a9caf59f60e55a8caf96f856713bd0ef0cc25a7 From: Arnd Bergmann Signed-off-by: Arnd Bergmann Cc: Shawn Guo Acked-by: Shawn Guo Cc: stable@vger.kernel.org diff --git a/arch/arm/mach-mxs/pm.h b/arch/arm/mach-mxs/pm.h index f57e7cd..09d77b0 100644 --- a/arch/arm/mach-mxs/pm.h +++ b/arch/arm/mach-mxs/pm.h @@ -9,6 +9,10 @@ #ifndef __ARCH_MXS_PM_H #define __ARCH_MXS_PM_H +#ifdef CONFIG_PM void mxs_pm_init(void); +#else +#define mxs_pm_init NULL +#endif #endif