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 branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
net
/
bluetooth
/
bnep
/
netdev.c
diff --git
a/net/bluetooth/bnep/netdev.c
b/net/bluetooth/bnep/netdev.c
index
260a950
..
d48b33f
100644
(file)
--- a/
net/bluetooth/bnep/netdev.c
+++ b/
net/bluetooth/bnep/netdev.c
@@
-26,6
+26,7
@@
*/
#include <linux/module.h>
+#include <linux/slab.h>
#include <linux/socket.h>
#include <linux/netdevice.h>