summaryrefslogtreecommitdiff
path: root/drivers/misc/uacce
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-08-08 07:14:30 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-08-08 07:14:30 +0300
commitb79675e15a754ca51b9fc631e0961ccdd4ec3fc7 (patch)
tree7df53cef573ef848ba5005475d66dae47ee3cde1 /drivers/misc/uacce
parentd57b2b5bc4301f37d1b07e3351d575bd634c7300 (diff)
parent6414e9b09ffd197803f8e86ce2fafdaf1de4e8e4 (diff)
downloadlinux-b79675e15a754ca51b9fc631e0961ccdd4ec3fc7.tar.xz
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull misc vfs updates from Al Viro: "No common topic whatsoever in those, sorry" * 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: fs: define inode flags using bit numbers iov_iter: Move unnecessary inclusion of crypto/hash.h dlmfs: clean up dlmfs_file_{read,write}() a bit
Diffstat (limited to 'drivers/misc/uacce')
-rw-r--r--drivers/misc/uacce/uacce.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/uacce/uacce.c b/drivers/misc/uacce/uacce.c
index aa91f69a5fa9..a5b8dab80c76 100644
--- a/drivers/misc/uacce/uacce.c
+++ b/drivers/misc/uacce/uacce.c
@@ -4,6 +4,7 @@
#include <linux/iommu.h>
#include <linux/module.h>
#include <linux/poll.h>
+#include <linux/slab.h>
#include <linux/uacce.h>
static struct class *uacce_class;