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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...
[pandora-kernel.git]
/
fs
/
ecryptfs
/
crypto.c
diff --git
a/fs/ecryptfs/crypto.c
b/fs/ecryptfs/crypto.c
index
fad5bf6
..
1cc0876
100644
(file)
--- a/
fs/ecryptfs/crypto.c
+++ b/
fs/ecryptfs/crypto.c
@@
-33,6
+33,7
@@
#include <linux/crypto.h>
#include <linux/file.h>
#include <linux/scatterlist.h>
+#include <linux/slab.h>
#include <asm/unaligned.h>
#include "ecryptfs_kernel.h"