From 597b35976a5c0372e3a0854133198a840d2295b3 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Tue, 8 May 2007 18:40:27 -0700
Subject: [PATCH] --- yaml --- r: 55953 b: refs/heads/master c:
 5b323edbf9daf287fed50dcc63a85589ba24887b h: refs/heads/master i:   55951:
 2957ed7b65e61b26e75a5c0b02d055ad3dde753e v: v3

---
 [refs]                             | 2 +-
 trunk/net/mac80211/ieee80211_sta.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 529d0fb426e9..6e3052c9c2f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 294cc44b7e48a6e7732499eebcf409b231460d8e
+refs/heads/master: 5b323edbf9daf287fed50dcc63a85589ba24887b
diff --git a/trunk/net/mac80211/ieee80211_sta.c b/trunk/net/mac80211/ieee80211_sta.c
index 822917debeff..3e07e9d6fa42 100644
--- a/trunk/net/mac80211/ieee80211_sta.c
+++ b/trunk/net/mac80211/ieee80211_sta.c
@@ -17,6 +17,7 @@
  * scan result table filtering (by capability (privacy, IBSS/BSS, WPA/RSN IE,
  *    SSID)
  */
+#include <linux/delay.h>
 #include <linux/if_ether.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
@@ -27,7 +28,6 @@
 #include <linux/rtnetlink.h>
 #include <net/iw_handler.h>
 #include <asm/types.h>
-#include <asm/delay.h>
 
 #include <net/mac80211.h>
 #include "ieee80211_i.h"