From 61ea0c25fedc3f7801fc277b938142f9d51c2e4c Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 20 Feb 2012 11:38:41 +0100
Subject: [PATCH] --- yaml --- r: 290700 b: refs/heads/master c:
 d26ad3771fe7405bf80d736cae9ba4c706a7b1d8 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/net/mac80211/ibss.c      | 1 -
 trunk/net/mac80211/key.c       | 1 +
 trunk/net/mac80211/mesh.h      | 1 -
 trunk/net/mac80211/mesh_hwmp.c | 1 +
 trunk/net/mac80211/rx.c        | 1 +
 trunk/net/mac80211/status.c    | 1 +
 7 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b0fffe5b800e..4ff416f20c5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b5773ebd5c9719aec30e58429db2d3b3f343d2c
+refs/heads/master: d26ad3771fe7405bf80d736cae9ba4c706a7b1d8
diff --git a/trunk/net/mac80211/ibss.c b/trunk/net/mac80211/ibss.c
index 8361da4b36ab..7f9ac577600a 100644
--- a/trunk/net/mac80211/ibss.c
+++ b/trunk/net/mac80211/ibss.c
@@ -20,7 +20,6 @@
 #include <linux/etherdevice.h>
 #include <linux/rtnetlink.h>
 #include <net/mac80211.h>
-#include <asm/unaligned.h>
 
 #include "ieee80211_i.h"
 #include "driver-ops.h"
diff --git a/trunk/net/mac80211/key.c b/trunk/net/mac80211/key.c
index e8616b3ff636..5bb600d93d77 100644
--- a/trunk/net/mac80211/key.c
+++ b/trunk/net/mac80211/key.c
@@ -17,6 +17,7 @@
 #include <linux/slab.h>
 #include <linux/export.h>
 #include <net/mac80211.h>
+#include <asm/unaligned.h>
 #include "ieee80211_i.h"
 #include "driver-ops.h"
 #include "debugfs_key.h"
diff --git a/trunk/net/mac80211/mesh.h b/trunk/net/mac80211/mesh.h
index bd14bd26a2b6..c7e5c49471e5 100644
--- a/trunk/net/mac80211/mesh.h
+++ b/trunk/net/mac80211/mesh.h
@@ -13,7 +13,6 @@
 
 #include <linux/types.h>
 #include <linux/jhash.h>
-#include <asm/unaligned.h>
 #include "ieee80211_i.h"
 
 
diff --git a/trunk/net/mac80211/mesh_hwmp.c b/trunk/net/mac80211/mesh_hwmp.c
index c27dec904963..31bc762f209d 100644
--- a/trunk/net/mac80211/mesh_hwmp.c
+++ b/trunk/net/mac80211/mesh_hwmp.c
@@ -8,6 +8,7 @@
  */
 
 #include <linux/slab.h>
+#include <asm/unaligned.h>
 #include "wme.h"
 #include "mesh.h"
 
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index 3ab85c02ef04..7a4ff02af261 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -19,6 +19,7 @@
 #include <linux/export.h>
 #include <net/mac80211.h>
 #include <net/ieee80211_radiotap.h>
+#include <asm/unaligned.h>
 
 #include "ieee80211_i.h"
 #include "driver-ops.h"
diff --git a/trunk/net/mac80211/status.c b/trunk/net/mac80211/status.c
index d67f0b967f8a..c928e4a4effd 100644
--- a/trunk/net/mac80211/status.c
+++ b/trunk/net/mac80211/status.c
@@ -11,6 +11,7 @@
 
 #include <linux/export.h>
 #include <net/mac80211.h>
+#include <asm/unaligned.h>
 #include "ieee80211_i.h"
 #include "rate.h"
 #include "mesh.h"