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 'fix/hda' into for-linus
[pandora-kernel.git]
/
Documentation
/
keys-request-key.txt
diff --git
a/Documentation/keys-request-key.txt
b/Documentation/keys-request-key.txt
index
266955d
..
09b55e4
100644
(file)
--- a/
Documentation/keys-request-key.txt
+++ b/
Documentation/keys-request-key.txt
@@
-11,26
+11,29
@@
request_key*():
struct key *request_key(const struct key_type *type,
const char *description,
struct key *request_key(const struct key_type *type,
const char *description,
- const char *callout_
string
);
+ const char *callout_
info
);
or:
struct key *request_key_with_auxdata(const struct key_type *type,
const char *description,
or:
struct key *request_key_with_auxdata(const struct key_type *type,
const char *description,
- const char *callout_string,
+ const char *callout_info,
+ size_t callout_len,
void *aux);
or:
struct key *request_key_async(const struct key_type *type,
const char *description,
void *aux);
or:
struct key *request_key_async(const struct key_type *type,
const char *description,
- const char *callout_string);
+ const char *callout_info,
+ size_t callout_len);
or:
struct key *request_key_async_with_auxdata(const struct key_type *type,
const char *description,
or:
struct key *request_key_async_with_auxdata(const struct key_type *type,
const char *description,
- const char *callout_string,
+ const char *callout_info,
+ size_t callout_len,
void *aux);
Or by userspace invoking the request_key system call:
void *aux);
Or by userspace invoking the request_key system call: