summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/ath/ath9k/ath9k.h
diff options
context:
space:
mode:
authorChris Metcalf <cmetcalf@tilera.com>2010-11-24 13:30:28 -0500
committerChris Metcalf <cmetcalf@tilera.com>2010-11-24 13:30:28 -0500
commitb03a6c4c7d8ebd8118d668eafdb85f5f76b5437f (patch)
treef6ca7059e9c1bc1aac9a6741316f8e07ba349f7f /drivers/net/wireless/ath/ath9k/ath9k.h
parent24f3f6b5eff92608a62449e33bfac0eed1447d02 (diff)
parent3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff)
downloadlinux-next-b03a6c4c7d8ebd8118d668eafdb85f5f76b5437f.tar.gz
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ath9k.h')
-rw-r--r--drivers/net/wireless/ath/ath9k/ath9k.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 9b8e7e3fcebd..170d44a35ccb 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -675,6 +675,7 @@ static inline void ath_read_cachesize(struct ath_common *common, int *csz)
}
extern struct ieee80211_ops ath9k_ops;
+extern struct pm_qos_request_list ath9k_pm_qos_req;
extern int modparam_nohwcrypt;
extern int led_blink;