diff options
author | David S. Miller <davem@davemloft.net> | 2008-09-09 03:10:53 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-09-09 03:10:53 +0400 |
commit | 9bff9dbd00e5907f5c36e72bae8aee8a46440e11 (patch) | |
tree | 4a5666939b61a13e7cde01b29baf4cb609fb8c90 /drivers/net/wireless/iwlwifi/iwl-power.h | |
parent | e2a6b85247aacc52d6ba0d9b37a99b8d1a3e0d83 (diff) | |
parent | d10c4ec8b4bc02f3874c7ef3c3539e4e7e123969 (diff) | |
download | linux-9bff9dbd00e5907f5c36e72bae8aee8a46440e11.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-power.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-power.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.h b/drivers/net/wireless/iwlwifi/iwl-power.h index abcbbf96a84e..aa99f3647def 100644 --- a/drivers/net/wireless/iwlwifi/iwl-power.h +++ b/drivers/net/wireless/iwlwifi/iwl-power.h @@ -78,8 +78,10 @@ struct iwl_power_mgr { u8 power_disabled; /* flag to disable using power saving level */ }; +void iwl_setup_power_deferred_work(struct iwl_priv *priv); +void iwl_power_cancel_timeout(struct iwl_priv *priv); int iwl_power_update_mode(struct iwl_priv *priv, u8 refresh); -int iwl_power_disable_management(struct iwl_priv *priv); +int iwl_power_disable_management(struct iwl_priv *priv, u32 ms); int iwl_power_enable_management(struct iwl_priv *priv); int iwl_power_set_user_mode(struct iwl_priv *priv, u16 mode); int iwl_power_set_system_mode(struct iwl_priv *priv, u16 mode); |