git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
[safe/jmp/linux-2.6]
/
fs
/
ceph
/
crypto.c
diff --git
a/fs/ceph/crypto.c
b/fs/ceph/crypto.c
index
291ac28
..
f704b3b
100644
(file)
--- a/
fs/ceph/crypto.c
+++ b/
fs/ceph/crypto.c
@@
-3,6
+3,7
@@
#include <linux/err.h>
#include <linux/scatterlist.h>
+#include <linux/slab.h>
#include <crypto/hash.h>
#include "crypto.h"