From 4d1a23c51ab8c1c297d07973cb7766c1f620fba2 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni.malinen@atheros.com>
Date: Tue, 29 Dec 2009 12:43:58 +0200
Subject: [PATCH] --- yaml --- r: 183542 b: refs/heads/master c:
 29401f6630c02ce996561bf2667d84ecdfacb823 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/main.c | 1 -
 trunk/net/mac80211/scan.c | 1 -
 trunk/net/mac80211/util.c | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3232461d8c67..316907751ded 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61b91c1ea31d0d3ae5f848f7f7eab53dd691f8d0
+refs/heads/master: 29401f6630c02ce996561bf2667d84ecdfacb823
diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c
index d0a14d953f08..468829143991 100644
--- a/trunk/net/mac80211/main.c
+++ b/trunk/net/mac80211/main.c
@@ -17,7 +17,6 @@
 #include <linux/skbuff.h>
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>
-#include <linux/wireless.h>
 #include <linux/rtnetlink.h>
 #include <linux/bitmap.h>
 #include <linux/pm_qos_params.h>
diff --git a/trunk/net/mac80211/scan.c b/trunk/net/mac80211/scan.c
index 365f40975511..a4c63d4e6845 100644
--- a/trunk/net/mac80211/scan.c
+++ b/trunk/net/mac80211/scan.c
@@ -12,7 +12,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/wireless.h>
 #include <linux/if_arp.h>
 #include <linux/rtnetlink.h>
 #include <net/mac80211.h>
diff --git a/trunk/net/mac80211/util.c b/trunk/net/mac80211/util.c
index 29e1acca207c..4635d4e5af9e 100644
--- a/trunk/net/mac80211/util.c
+++ b/trunk/net/mac80211/util.c
@@ -18,7 +18,6 @@
 #include <linux/skbuff.h>
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>
-#include <linux/wireless.h>
 #include <linux/bitmap.h>
 #include <linux/crc32.h>
 #include <net/net_namespace.h>