projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[platform/kernel/linux-rpi.git]
/
fs
/
crypto
/
fname.c
diff --git
a/fs/crypto/fname.c
b/fs/crypto/fname.c
index
988dadf
..
3414d35
100644
(file)
--- a/
fs/crypto/fname.c
+++ b/
fs/crypto/fname.c
@@
-14,7
+14,7
@@
#include <linux/namei.h>
#include <linux/scatterlist.h>
#include <crypto/hash.h>
-#include <crypto/sha.h>
+#include <crypto/sha
2
.h>
#include <crypto/skcipher.h>
#include "fscrypt_private.h"