Merge remote branch 'origin' into secretlab/next-devicetree

[karo-tx-linux.git] / net / mac80211 / rx.c

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 8fa99554f4e286ff2817d1a93310a64effb50634..6e2a7bcd8cb888ce24be03cc56cb2516ca95fade 100644 (file)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -10,6 +10,7 @@
  */
 
 #include <linux/jiffies.h>
+#include <linux/slab.h>
 #include <linux/kernel.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>