git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
iwlegacy
/
iwl-core.h
diff --git
a/drivers/net/wireless/iwlegacy/iwl-core.h
b/drivers/net/wireless/iwlegacy/iwl-core.h
index
bc66c60
..
c5fbda0
100644
(file)
--- a/
drivers/net/wireless/iwlegacy/iwl-core.h
+++ b/
drivers/net/wireless/iwlegacy/iwl-core.h
@@
-560,7
+560,7
@@
void iwl_legacy_free_geos(struct iwl_priv *priv);
#define STATUS_SCAN_HW 15
#define STATUS_POWER_PMI 16
#define STATUS_FW_ERROR 17
-
+#define STATUS_CHANNEL_SWITCH_PENDING 18
static inline int iwl_legacy_is_ready(struct iwl_priv *priv)
{