From patchwork Fri May 31 22:22:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 2646011 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 21DCEDFB79 for ; Fri, 31 May 2013 22:32:12 +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 1UiXpF-0008G2-PR; Fri, 31 May 2013 22:29:36 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiXmD-0004TE-TV; Fri, 31 May 2013 22:26:25 +0000 Received: from bombadil.infradead.org ([2001:1868:205::9]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiXjt-0004I8-CM for linux-arm-kernel@merlin.infradead.org; Fri, 31 May 2013 22:24:01 +0000 Received: from moutng.kundenserver.de ([212.227.126.186]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UiXjr-0000Em-LV for linux-arm-kernel@lists.infradead.org; Fri, 31 May 2013 22:24:00 +0000 Received: from wuerfel.lan (HSI-KBW-095-208-002-043.hsi5.kabel-badenwuerttemberg.de [95.208.2.43]) by mrelayeu.kundenserver.de (node=mreu3) with ESMTP (Nemesis) id 0MfNmw-1V2z3a0PGM-00OovY; Sat, 01 Jun 2013 00:23:04 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org Subject: [PATCH 11/15] iwlegacy: il_pm_ops is only provided for PM_SLEEP Date: Sat, 1 Jun 2013 00:22:48 +0200 Message-Id: <1370038972-2318779-12-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1370038972-2318779-1-git-send-email-arnd@arndb.de> References: <1370038972-2318779-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:hn94O5MhwnaAnO/oz960hc+3JIGAjQe/eZW3LjqVDlh KYcGMLUgKCs9wuC1O9c67tdAINK9JLfKlmvtbKeeDlNowYG9Rd ztQNl2YLo1l26UbOyQQqecQIp9rhOEvIMy0jyAxj9b0Q3qNFaX SqXd/ijCEs7UIoHMU8stzWN08R84mhRhyYfqbFRTxS8PzNSQUn vZHPgemK/nihOhbwQxqxmens8Mm9xvF3jJCaeYMXnF8sx9qdQi SuqWv28Ck2R46chFeETf0cy7pY8QvKXhpPVuPUTBLbXg/VXFe5 O/yfdKad57g3m8LIT0GAQKFU730qvYWW8eFmU76S9w5z0S77/t ithny5DBQh2RcdMHtQnvGo2x9DxtNn5h0agVYSOcA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130531_152400_037560_2127381F X-CRM114-Status: UNSURE ( 9.06 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.186 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record Cc: Arnd Bergmann , Johannes Berg , "John W. Linville" , Borislav Petkov , patches@lists.linaro.org, 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 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. As suggested by Borislav Petkov, this removes the comments for the #else and #endif lines. drivers/built-in.o:(.data+0x57974): undefined reference to `il_pm_ops' Cc: Johannes Berg Cc: John W. Linville Cc: Borislav Petkov Signed-off-by: Arnd Bergmann --- drivers/net/wireless/iwlegacy/common.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h index f8246f2..30dda98 100644 --- a/drivers/net/wireless/iwlegacy/common.h +++ b/drivers/net/wireless/iwlegacy/common.h @@ -1832,14 +1832,14 @@ 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) -#else /* !CONFIG_PM */ +#else -#define IL_LEGACY_PM_OPS NULL +#define #endif /* !CONFIG_PM */