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 'devel-stable' into devel
[pandora-kernel.git]
/
drivers
/
net
/
macvtap.c
diff --git
a/drivers/net/macvtap.c
b/drivers/net/macvtap.c
index
55ceae0
..
abba3cc
100644
(file)
--- a/
drivers/net/macvtap.c
+++ b/
drivers/net/macvtap.c
@@
-9,6
+9,7
@@
#include <linux/cache.h>
#include <linux/sched.h>
#include <linux/types.h>
+#include <linux/slab.h>
#include <linux/init.h>
#include <linux/wait.h>
#include <linux/cdev.h>