diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-20 15:24:57 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-20 15:24:57 -0400 |
| commit | 5470b462c3f0c6fa980c320968a165bd0f34ca8d (patch) | |
| tree | eb20de947bec8133d27f97f7af8ae4cf35def663 /drivers/net/wireless/iwlegacy/common.c | |
| parent | 4c1d8d0617a39c8325a7c2fd80ac14bf40fd8cc6 (diff) | |
| parent | 0d4e67174b03e3dcfe75ce7ec488770a5d443bf4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
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 db2187124032..01e2d2b4ec59 100644 --- a/drivers/net/wireless/iwlegacy/common.c +++ b/drivers/net/wireless/iwlegacy/common.c | |||
| @@ -1122,7 +1122,7 @@ il_set_power(struct il_priv *il, struct il_powertable_cmd *cmd) | |||
| 1122 | sizeof(struct il_powertable_cmd), cmd); | 1122 | sizeof(struct il_powertable_cmd), cmd); |
| 1123 | } | 1123 | } |
| 1124 | 1124 | ||
| 1125 | int | 1125 | static int |
| 1126 | il_power_set_mode(struct il_priv *il, struct il_powertable_cmd *cmd, bool force) | 1126 | il_power_set_mode(struct il_priv *il, struct il_powertable_cmd *cmd, bool force) |
| 1127 | { | 1127 | { |
| 1128 | int ret; | 1128 | int ret; |