summaryrefslogtreecommitdiff
path: root/include/net/cfg80211.h
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2017-02-17 16:15:57 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2017-02-17 16:15:57 +1100
commitde8fdfbee55bdebd048ec45854c9c0fc30240c7f (patch)
tree3c193ea8ced47b9018eb3bd1a73956d2b9d564fd /include/net/cfg80211.h
parent6641ce8e95e9cb5c678cf882f9eb7c7632fa1a2c (diff)
parent171cef6d6ec6c1b4e95f2053545b2dd91931518b (diff)
Merge branch 'akpm/master'
Diffstat (limited to 'include/net/cfg80211.h')
-rw-r--r--include/net/cfg80211.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 86c12f85fb53..ffc08687b31d 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1948,7 +1948,7 @@ struct cfg80211_deauth_request {
* struct cfg80211_disassoc_request - Disassociation request data
*
* This structure provides information needed to complete IEEE 802.11
- * disassocation.
+ * disassociation.
*
* @bss: the BSS to disassociate from
* @ie: Extra IEs to add to Disassociation frame or %NULL