git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.34-rc6'
[safe/jmp/linux-2.6]
/
net
/
mac80211
/
debugfs_key.c
diff --git
a/net/mac80211/debugfs_key.c
b/net/mac80211/debugfs_key.c
index
d12e743
..
97c9e46
100644
(file)
--- a/
net/mac80211/debugfs_key.c
+++ b/
net/mac80211/debugfs_key.c
@@
-9,6
+9,7
@@
*/
#include <linux/kobject.h>
+#include <linux/slab.h>
#include "ieee80211_i.h"
#include "key.h"
#include "debugfs.h"