The patch titled
     mac80211: include <linux/delay.h> instead of <asm/delay.h>
has been removed from the -mm tree.  Its filename was
     mac80211-include-linux-delayh-instead-of-asm-delayh.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: mac80211: include <linux/delay.h> instead of <asm/delay.h>
From: Geert Uytterhoeven <[EMAIL PROTECTED]>

|   CC      net/mac80211/ieee80211_sta.o
| In file included from linux/net/mac80211/ieee80211_sta.c:31:
| include2/asm/delay.h: In function '__const_udelay':
| include2/asm/delay.h:33: error: 'loops_per_jiffy' undeclared (first use in 
this function)
| include2/asm/delay.h:33: error: (Each undeclared identifier is reported only 
once
| include2/asm/delay.h:33: error: for each function it appears in.)

mac80211: include <linux/delay.h> instead of <asm/delay.h>

Signed-off-by: Geert Uytterhoeven <[EMAIL PROTECTED]>
Cc: "John W. Linville" <[EMAIL PROTECTED]>
Cc: "David S. Miller" <[EMAIL PROTECTED]>
Cc: Jeff Garzik <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 net/mac80211/ieee80211_sta.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN 
net/mac80211/ieee80211_sta.c~mac80211-include-linux-delayh-instead-of-asm-delayh
 net/mac80211/ieee80211_sta.c
--- 
a/net/mac80211/ieee80211_sta.c~mac80211-include-linux-delayh-instead-of-asm-delayh
+++ a/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"
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

origin.patch
m68k-asm-scatterlisth-needs-linux-typesh.patch
git-net.patch
allow-arch-to-initialize-arch-field-of-the-module-structure.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to