[PATCH v2] iwlegacy: il_pm_ops is only provided for PM_SLEEP
Arnd Bergmann
arnd at arndb.de
Sat Jun 1 05:12:32 EDT 2013
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 <johannes.berg at intel.com>
Cc: John W. Linville <linville at tuxdriver.com>
Cc: Borislav Petkov <bp at alien8.de>
Signed-off-by: Arnd Bergmann <arnd at arndb.de>
---
v2: Fixed the obvious bug pointed out by Brian Norris, and actually
build-tested the new version.
diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h
index f8246f2..f043092 100644
--- a/drivers/net/wireless/iwlegacy/common.h
+++ b/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
#define IL_LEGACY_PM_OPS NULL
-#endif /* !CONFIG_PM */
+#endif
/*****************************************************
* Error Handling Debugging
More information about the linux-arm-kernel
mailing list