From patchwork Fri Jun 21 23:30:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2764941 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 105ED9F472 for ; Fri, 21 Jun 2013 23:31:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4541820132 for ; Fri, 21 Jun 2013 23:31:12 +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 4F6F1200FE for ; Fri, 21 Jun 2013 23:31:11 +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 1UqAm8-0005UY-8g; Fri, 21 Jun 2013 23:29:53 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UqAlt-0008AQ-IS; Fri, 21 Jun 2013 23:29:37 +0000 Received: from moutng.kundenserver.de ([212.227.126.186]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UqAlr-00089v-Gx for linux-arm-kernel@lists.infradead.org; Fri, 21 Jun 2013 23:29:36 +0000 Received: from wuerfel.localnet (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0MQODc-1UiNnB1ka4-00TpXN; Sat, 22 Jun 2013 01:29:13 +0200 From: Arnd Bergmann To: Shawn Guo Subject: [PATCH] ARM: mxs: stub out mxs_pm_init for !CONFIG_PM Date: Sat, 22 Jun 2013 01:30:17 +0200 Message-ID: <2964094.prhBouhISv@wuerfel> User-Agent: KMail/4.10.3 (Linux/3.9.0-2-generic; KDE/4.10.4; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V02:K0:Oh8LaE7a83hGj3Y/+SHSMyN/FJxji6z5l4OcMAqWWos we/MG4mx4mUTq0dl1PULYLPN28WzNDQ4hRBLMxWozQf1vA16Qa hDi9wJjDFLHglFuS9ST78yBOxZ4klFcmh6Nc23ON0KGKO4Ollc YZ1P+WDGqlbNqODoQD171qLCfhKlhqpBjFW0rARfhAQGlF1CMp +SPP4VuK1tXMkOcPnGBVp7ihkes18ESyERBZdsW/rZPeLao+/u K7/o4AYiHCyhtwCzntQViXBrwsDb1IjJ7IgKSAtytenbGW2qZn XB0Tmn28PYqqgcZRaXrNJTblsErRPv5Hq+sejupBR9X98G5mXo vwu/jhCelOwkzxPg+V/8= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130621_192935_791896_26011ED4 X-CRM114-Status: UNSURE ( 4.69 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: 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 X-Spam-Status: No, score=-5.7 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 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. Signed-off-by: Arnd Bergmann Cc: Shawn Guo Acked-by: Shawn Guo 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