diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-20 03:09:19 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-20 03:09:19 +0200 |
| commit | 9e46efe2918aeb0acd0805e55090c3552037f2df (patch) | |
| tree | 19be74d133f16c7396cb3734fb796554bf3ac47e /crypto/userspace/ncr-int.h | |
| parent | a7c8e9859418d1da9c898925dc291d0dd07c5ac2 (diff) | |
| parent | cc7a2bee6cd5688f44e7b0cf1d28722fabf4a80c (diff) | |
| download | kernel-crypto-9e46efe2918aeb0acd0805e55090c3552037f2df.tar.gz kernel-crypto-9e46efe2918aeb0acd0805e55090c3552037f2df.tar.xz kernel-crypto-9e46efe2918aeb0acd0805e55090c3552037f2df.zip | |
Merge branch 'standalone-rename' into userspace-crypto
Diffstat (limited to 'crypto/userspace/ncr-int.h')
| -rw-r--r-- | crypto/userspace/ncr-int.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/userspace/ncr-int.h b/crypto/userspace/ncr-int.h index fdc0200a931..8574b5ace57 100644 --- a/crypto/userspace/ncr-int.h +++ b/crypto/userspace/ncr-int.h @@ -104,8 +104,7 @@ struct ncr_lists { void* ncr_init_lists(void); void ncr_deinit_lists(struct ncr_lists *lst); -int ncr_ioctl(struct ncr_lists*, struct file *filp, - unsigned int cmd, unsigned long arg); +int ncr_ioctl(struct ncr_lists *lst, unsigned int cmd, unsigned long arg); /* key derivation */ int ncr_key_derive(struct ncr_lists *lst, void __user* arg); |