diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-07 14:07:11 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-07 14:07:11 -0400 |
| commit | 41bfce8edebbe9dc6ddc238a71f07fbe9ab46016 (patch) | |
| tree | 31e1799bdb73dd5b7bc5aea367cc6fead035e396 /drivers/net/wireless/iwlwifi/iwl-core.h | |
| parent | 805a3b810708db3261cc8c1183ffb2703a5ce243 (diff) | |
| parent | 51892dbbd511911c0f965a36b431fc3e8f1e4f8a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index b38477c8ad4e..05ea88aa76e3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
| @@ -558,6 +558,7 @@ void iwlcore_free_geos(struct iwl_priv *priv); | |||
| 558 | #define STATUS_POWER_PMI 16 | 558 | #define STATUS_POWER_PMI 16 |
| 559 | #define STATUS_FW_ERROR 17 | 559 | #define STATUS_FW_ERROR 17 |
| 560 | #define STATUS_DEVICE_ENABLED 18 | 560 | #define STATUS_DEVICE_ENABLED 18 |
| 561 | #define STATUS_CHANNEL_SWITCH_PENDING 19 | ||
| 561 | 562 | ||
| 562 | 563 | ||
| 563 | static inline int iwl_is_ready(struct iwl_priv *priv) | 564 | static inline int iwl_is_ready(struct iwl_priv *priv) |