diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-07-13 15:57:29 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-13 15:57:29 -0400 |
| commit | e300d955debdadf599c36e47eb0bc16f5976215c (patch) | |
| tree | 8fafcc789dc06e90665e6eee6388af228bbd2fd7 /drivers/net/wireless/libertas/cmd.h | |
| parent | 242647bcf8464860f173f3d4d4ab3490d3558518 (diff) | |
| parent | 815868e7b5c207ba42d5b317ccc51f8112732268 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/wl12xx/wl1271_cmd.h
Diffstat (limited to 'drivers/net/wireless/libertas/cmd.h')
| -rw-r--r-- | drivers/net/wireless/libertas/cmd.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/libertas/cmd.h b/drivers/net/wireless/libertas/cmd.h index cb4138a55fd..386e565d99a 100644 --- a/drivers/net/wireless/libertas/cmd.h +++ b/drivers/net/wireless/libertas/cmd.h | |||
| @@ -127,4 +127,6 @@ int lbs_set_tx_power(struct lbs_private *priv, s16 dbm); | |||
| 127 | 127 | ||
| 128 | int lbs_set_deep_sleep(struct lbs_private *priv, int deep_sleep); | 128 | int lbs_set_deep_sleep(struct lbs_private *priv, int deep_sleep); |
| 129 | 129 | ||
| 130 | int lbs_set_host_sleep(struct lbs_private *priv, int host_sleep); | ||
| 131 | |||
| 130 | #endif /* _LBS_CMD_H */ | 132 | #endif /* _LBS_CMD_H */ |