Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757576Ab3EaWXz (ORCPT ); Fri, 31 May 2013 18:23:55 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:61687 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757650Ab3EaWXi (ORCPT ); Fri, 31 May 2013 18:23:38 -0400 From: Arnd Bergmann To: linux-kernel@vger.kernel.org Cc: patches@lists.linaro.org, linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Johannes Berg , "John W. Linville" , Borislav Petkov 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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1513 Lines: 50 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 */ -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/