diff options
| author | David S. Miller <davem@davemloft.net> | 2013-05-24 19:48:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-24 19:48:28 -0400 |
| commit | e6ff4c75f9095f61b3a66c2a78e47b62864022dd (patch) | |
| tree | 425ea9463cbec0b1975b8a33d9a56817143055d0 /drivers/net/wireless/iwlegacy/common.c | |
| parent | ee9c799c231324de681eb21e06d8bf4842768b75 (diff) | |
| parent | 0e255f1c0c9add2f0c920240ac4cadc28ae274c3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge net into net-next because some upcoming net-next changes
build on top of bug fixes that went into net.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/common.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/common.c | 2 |
1 files changed, 1 insertions, 1 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) | |||
| 1423 | } | 1423 | } |
| 1424 | EXPORT_SYMBOL(il_setup_rx_scan_handlers); | 1424 | EXPORT_SYMBOL(il_setup_rx_scan_handlers); |
| 1425 | 1425 | ||
| 1426 | inline u16 | 1426 | u16 |
| 1427 | il_get_active_dwell_time(struct il_priv *il, enum ieee80211_band band, | 1427 | il_get_active_dwell_time(struct il_priv *il, enum ieee80211_band band, |
| 1428 | u8 n_probes) | 1428 | u8 n_probes) |
| 1429 | { | 1429 | { |