diff options
| author | John W. Linville | 2013-06-12 20:35:23 +0200 |
|---|---|---|
| committer | John W. Linville | 2013-06-12 20:35:23 +0200 |
| commit | 861bca265e7808e2493590843b8585f6943af16f (patch) | |
| tree | f9c6d3beee927191856479888bc845859cd135cf /drivers/net/wireless/iwlegacy | |
| parent | cw1200: Fix an assorted pile of checkpatch warnings. (diff) | |
| parent | b43: stop format string leaking into error msgs (diff) | |
| download | kernel-qcow2-linux-861bca265e7808e2493590843b8585f6943af16f.tar.gz kernel-qcow2-linux-861bca265e7808e2493590843b8585f6943af16f.tar.xz kernel-qcow2-linux-861bca265e7808e2493590843b8585f6943af16f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/ath/ath9k/Kconfig
net/mac80211/iface.c
Diffstat (limited to 'drivers/net/wireless/iwlegacy')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/common.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/iwlegacy/common.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlegacy/common.c b/drivers/net/wireless/iwlegacy/common.c index 592d0aa634a8..e9a3cbc409ae 100644 --- a/drivers/net/wireless/iwlegacy/common.c +++ b/drivers/net/wireless/iwlegacy/common.c @@ -1423,7 +1423,7 @@ il_setup_rx_scan_handlers(struct il_priv *il) } EXPORT_SYMBOL(il_setup_rx_scan_handlers); -inline u16 +u16 il_get_active_dwell_time(struct il_priv *il, enum ieee80211_band band, u8 n_probes) { diff --git a/drivers/net/wireless/iwlegacy/common.h b/drivers/net/wireless/iwlegacy/common.h index f8246f2d88f9..4caaf52986a4 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 /* !CONFIG_PM_SLEEP */ #define IL_LEGACY_PM_OPS NULL -#endif /* !CONFIG_PM */ +#endif /* !CONFIG_PM_SLEEP */ /***************************************************** * Error Handling Debugging |