Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[deliverable/linux.git] / net / can / raw.c

diff --git a/net/can/raw.c b/net/can/raw.c
index abca920440b50cdf51e539fc18c6ea15f7ef698b..3a7dffb6519ce9083b876b64f823cffcb1020c3d 100644 (file)
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -45,6 +45,7 @@
 #include <linux/init.h>
 #include <linux/uio.h>
 #include <linux/net.h>
+#include <linux/slab.h>
 #include <linux/netdevice.h>
 #include <linux/socket.h>
 #include <linux/if_arp.h>