From patchwork Thu May 2 15:16:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2512501 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id A63D7DF215 for ; Thu, 2 May 2013 15:26:24 +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 1UXvLx-00024N-6R; Thu, 02 May 2013 15:23:30 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UXvHj-0002d3-2Y; Thu, 02 May 2013 15:19:03 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UXvGH-0002Q2-3F for linux-arm-kernel@merlin.infradead.org; Thu, 02 May 2013 15:17:33 +0000 Received: from moutng.kundenserver.de ([212.227.126.171]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UXvFk-0000Cb-F2 for linux-arm-kernel@lists.infradead.org; Thu, 02 May 2013 15:17:10 +0000 Received: from wuerfel.lan (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0MRvbR-1V0uF4001h-00SzxS; Thu, 02 May 2013 17:16:15 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org Subject: [PATCH, RFC 11/22] iwlegacy: il_pm_ops is only provided for PM_SLEEP Date: Thu, 2 May 2013 17:16:15 +0200 Message-Id: <1367507786-505303-12-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1367507786-505303-1-git-send-email-arnd@arndb.de> References: <1367507786-505303-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:w/C9krOopA1fxEq+3Rgmob2t3PJYgVF//iumj3BjiyS KH3q5fxUCXsyqrqnJL4ejB3G+pXtRkmb962QY/DhlaOEElFgyR Uz8wrXBJMBuUbKy0ASkOp6Tkkk6F1hWU1uoF6gOoiJ27d3Srp7 1BHXxKySbDowB9i7EdGCFiX4+Dh2OHItLb5YFaPQ2JwGYoHGMk PUxcgYxoIQx+nG7gY6TWABgaEk3SAobISMPn0QgPreehqCZcRc dATt+DRK0QShHCF9BWowp1OK4iAGFwGWwKgY/19cNrOjjwFOxi YQuOQwFbDL/MiGxp38gT4YRDr0Q+j3iZ4mA6n/XByHqcBKwRWh KLPNDhx7dTjwcz24+8nZY5OcdLP90MCfknHAqdUts X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130502_161700_891861_8810A547 X-CRM114-Status: GOOD ( 10.58 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on casper.infradead.org summary: Content analysis details: (-1.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.171 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: Johannes Berg , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, "John W. Linville" 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 This makes sure the conditionals for the declaration match the definition, so we provide the alternative #else #define IL_LEGACY_PM_OPS NULL #endif in the correct cases. drivers/built-in.o:(.data+0x57974): undefined reference to `il_pm_ops' Cc: Johannes Berg Cc: John W. Linville Signed-off-by: Arnd Bergmann --- drivers/net/wireless/iwlegacy/common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h index f8246f2..734f1b4 100644 --- a/drivers/net/wireless/iwlegacy/common.h +++ b/drivers/net/wireless/iwlegacy/common.h @@ -1832,7 +1832,7 @@ u32 il_usecs_to_beacons(struct il_priv *il, u32 usec, u32 beacon_interval); __le32 il_add_beacon_time(struct il_priv *il, u32 base, u32 addon, u32 beacon_interval); -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP extern const struct dev_pm_ops il_pm_ops; #define IL_LEGACY_PM_OPS (&il_pm_ops)