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 git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
[linux-2.6-microblaze.git]
/
security
/
keys
/
trusted.c
diff --git
a/security/keys/trusted.c
b/security/keys/trusted.c
index
ff67893
..
697bfc6
100644
(file)
--- a/
security/keys/trusted.c
+++ b/
security/keys/trusted.c
@@
-711,7
+711,7
@@
static int key_unseal(struct trusted_key_payload *p,
}
enum {
- Opt_err
= -1
,
+ Opt_err,
Opt_new, Opt_load, Opt_update,
Opt_keyhandle, Opt_keyauth, Opt_blobauth,
Opt_pcrinfo, Opt_pcrlock, Opt_migratable,