diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-08 13:24:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-08 13:24:29 +0100 |
| commit | bf06bec1f8b088965577b14eecaf532fe3ca1f58 (patch) | |
| tree | 68717606745d17d6dff26c849d3db0cd1490d3b1 /include | |
| parent | 965abff8d8accdffc4af1b11fcf580e83031330a (diff) | |
| parent | 85cdabba08d484bdcc4b25f0bbc23ac60c75aa5b (diff) | |
Merge tag 'v3.10.11' into linux-linaro-lsk
This is the 3.10.11 stable release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/regmap.h | 1 | ||||
| -rw-r--r-- | include/net/mac80211.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index f91bb416122..98c470ced98 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -16,6 +16,7 @@ #include <linux/list.h> #include <linux/rbtree.h> #include <linux/err.h> +#include <linux/bug.h> struct module; struct device; diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 885898a40d1..4e50d367443 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1484,6 +1484,7 @@ enum ieee80211_hw_flags { IEEE80211_HW_SUPPORTS_RC_TABLE = 1<<24, IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF = 1<<25, IEEE80211_HW_TIMING_BEACON_ONLY = 1<<26, + IEEE80211_HW_SUPPORTS_HT_CCK_RATES = 1<<27, }; /** |