From 6805f5f16c5b08048608ab2d0eb39bf2f7a8001a Mon Sep 17 00:00:00 2001 From: Yijing Wang Date: Fri, 31 May 2013 14:05:32 +0800 Subject: [PATCH] --- yaml --- r: 377031 b: refs/heads/master c: 71aa5bba83f81722e7f6bfaeda16b983ba8a0cc2 h: refs/heads/master i: 377029: b99ad1045bf7fbde8f48ce74ec49fe443d78bd65 377027: 29cb4d868a9714def4a7d9e8385850b370d43d3d 377023: a040f17d80ca9888f26bf1a02e6ca1ff7277c52d v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlegacy/common.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 47fc083ed124..b83f8bdfc8ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87ccee46fabd235c2bac3652dee009e8f791dc10 +refs/heads/master: 71aa5bba83f81722e7f6bfaeda16b983ba8a0cc2 diff --git a/trunk/drivers/net/wireless/iwlegacy/common.h b/trunk/drivers/net/wireless/iwlegacy/common.h index f8246f2d88f9..4caaf52986a4 100644 --- a/trunk/drivers/net/wireless/iwlegacy/common.h +++ b/trunk/drivers/net/wireless/iwlegacy/common.h @@ -1832,16 +1832,16 @@ 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 /* !CONFIG_PM_SLEEP */ #define IL_LEGACY_PM_OPS NULL -#endif /* !CONFIG_PM */ +#endif /* !CONFIG_PM_SLEEP */ /***************************************************** * Error Handling Debugging