diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-26 14:27:34 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-26 14:27:34 -0400 |
| commit | 2c443443e715fc79da9b7c3e4f31a71fcf315b09 (patch) | |
| tree | 5b73cea04b13c888d94e29000c0a66ed2c23980f /net/mac80211/offchannel.c | |
| parent | 5ea276963eacbef742fe4854883c0f69c903fcfd (diff) | |
| parent | 371a255e863857f988a91a3850d6feeaa4f3c536 (diff) | |
| download | op-kernel-dev-2c443443e715fc79da9b7c3e4f31a71fcf315b09.zip op-kernel-dev-2c443443e715fc79da9b7c3e4f31a71fcf315b09.tar.gz | |
Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next
Diffstat (limited to 'net/mac80211/offchannel.c')
| -rw-r--r-- | net/mac80211/offchannel.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c index 7f93626..b0fb6a2 100644 --- a/net/mac80211/offchannel.c +++ b/net/mac80211/offchannel.c @@ -15,7 +15,6 @@ #include <linux/export.h> #include <net/mac80211.h> #include "ieee80211_i.h" -#include "driver-trace.h" #include "driver-ops.h" /* |
