Merge branch 'master' into for-davem

[mv-sheeva.git] / drivers / net / wireless / iwmc3200wifi / tx.c

diff --git a/drivers/net/wireless/iwmc3200wifi/tx.c b/drivers/net/wireless/iwmc3200wifi/tx.c
index 3cfa7b81fef23c0255d9849577d29a749e27f0c7..3216621fc55a020ecd081362d1633a30067a75bb 100644 (file)
--- a/drivers/net/wireless/iwmc3200wifi/tx.c
+++ b/drivers/net/wireless/iwmc3200wifi/tx.c
@@ -64,6 +64,7 @@
  * (i.e. half of the max size). [iwm_tx_worker]
  */
 
+#include <linux/slab.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 #include <linux/ieee80211.h>