diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-04-30 12:04:27 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-04-30 12:04:27 -0400 |
commit | f6595444c1ee798f9c227107bb3ab14730c6497a (patch) | |
tree | e8e06d7c2057c69e19848ee3abd6720927f5f9f9 /net/mac80211/debugfs_netdev.h | |
parent | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next (diff) | |
parent | mac80211_hwsim: Advertise support for AP mode channel width changes (diff) | |
download | linux-dev-f6595444c1ee798f9c227107bb3ab14730c6497a.tar.xz linux-dev-f6595444c1ee798f9c227107bb3ab14730c6497a.zip |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
net/mac80211/chan.c
Diffstat (limited to 'net/mac80211/debugfs_netdev.h')
-rw-r--r-- | net/mac80211/debugfs_netdev.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/debugfs_netdev.h b/net/mac80211/debugfs_netdev.h index 79025e79f4d6..9f5501a9a795 100644 --- a/net/mac80211/debugfs_netdev.h +++ b/net/mac80211/debugfs_netdev.h @@ -3,6 +3,8 @@ #ifndef __IEEE80211_DEBUGFS_NETDEV_H #define __IEEE80211_DEBUGFS_NETDEV_H +#include "ieee80211_i.h" + #ifdef CONFIG_MAC80211_DEBUGFS void ieee80211_debugfs_add_netdev(struct ieee80211_sub_if_data *sdata); void ieee80211_debugfs_remove_netdev(struct ieee80211_sub_if_data *sdata); |