projects
/
linux-2.6-microblaze.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
[linux-2.6-microblaze.git]
/
drivers
/
tee
/
tee_core.c
diff --git
a/drivers/tee/tee_core.c
b/drivers/tee/tee_core.c
index
6ade4a5
..
480d294
100644
(file)
--- a/
drivers/tee/tee_core.c
+++ b/
drivers/tee/tee_core.c
@@
-14,7
+14,7
@@
#include <linux/tee_drv.h>
#include <linux/uaccess.h>
#include <crypto/hash.h>
-#include <crypto/sha.h>
+#include <crypto/sha
1
.h>
#include "tee_private.h"
#define TEE_NUM_DEVICES 32