git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into for-linus
[pandora-kernel.git]
/
drivers
/
net
/
can
/
vcan.c
diff --git
a/drivers/net/can/vcan.c
b/drivers/net/can/vcan.c
index
d124d83
..
a30b8f4
100644
(file)
--- a/
drivers/net/can/vcan.c
+++ b/
drivers/net/can/vcan.c
@@
-48,6
+48,7
@@
#include <linux/if_ether.h>
#include <linux/can.h>
#include <linux/can/dev.h>
+#include <linux/slab.h>
#include <net/rtnetlink.h>
static __initdata const char banner[] =