diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-04-16 15:20:06 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-04-16 15:20:06 +0200 |
commit | cf0dbba515415bb19b11f9323d5f7bebd7f24fd6 (patch) | |
tree | 375bbc1ade1a92acd6493d224dd701fd7f209014 /net/mac80211/agg-tx.c | |
parent | ALSA: i2c: Fixed 8 checkpatch errors (diff) | |
parent | ALSA: Release v1.0.23 (diff) | |
download | linux-cf0dbba515415bb19b11f9323d5f7bebd7f24fd6.tar.xz linux-cf0dbba515415bb19b11f9323d5f7bebd7f24fd6.zip |
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'net/mac80211/agg-tx.c')
-rw-r--r-- | net/mac80211/agg-tx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c index 5538e1b4a697..96d25348aa59 100644 --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c @@ -14,6 +14,7 @@ */ #include <linux/ieee80211.h> +#include <linux/slab.h> #include <net/mac80211.h> #include "ieee80211_i.h" #include "driver-ops.h" |