[PATCH 11/15] iwlegacy: il_pm_ops is only provided for PM_SLEEP
From: computersforpeace@gmail.com (Brian Norris)
Date: 2013-06-01 05:43:29
Also in:
lkml
Hi Arnd, On Fri, May 31, 2013 at 3:22 PM, Arnd Bergmann [off-list ref] wrote:
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.
You seem to have missed the #endif line.
quoted hunk ↗ jump to hunk
drivers/built-in.o:(.data+0x57974): undefined reference to `il_pm_ops' Cc: Johannes Berg <redacted> Cc: John W. Linville <redacted> Cc: Borislav Petkov <bp@alien8.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- 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 */
This should not be "!CONFIG_PM" any more. Brian