diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-20 03:09:06 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-20 03:09:06 +0200 |
| commit | cc7a2bee6cd5688f44e7b0cf1d28722fabf4a80c (patch) | |
| tree | 9e24e045387dd09178bc8f1503d3288467a62a4c /crypto/userspace/ncr.c | |
| parent | 31372e35a86d90971a654a15571c85522aca73c6 (diff) | |
| parent | 3c86466e9230d6cee720a46a8e632f459069080c (diff) | |
| download | kernel-crypto-cc7a2bee6cd5688f44e7b0cf1d28722fabf4a80c.tar.gz kernel-crypto-cc7a2bee6cd5688f44e7b0cf1d28722fabf4a80c.tar.xz kernel-crypto-cc7a2bee6cd5688f44e7b0cf1d28722fabf4a80c.zip | |
Merge branch 'standalone-master' into standalone-rename
Diffstat (limited to 'crypto/userspace/ncr.c')
| -rw-r--r-- | crypto/userspace/ncr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/userspace/ncr.c b/crypto/userspace/ncr.c index 86c8c7ad8ad..81e3fa32cef 100644 --- a/crypto/userspace/ncr.c +++ b/crypto/userspace/ncr.c @@ -117,8 +117,7 @@ struct ncr_master_key_st st; } int -ncr_ioctl(struct ncr_lists* lst, struct file *filp, - unsigned int cmd, unsigned long arg_) +ncr_ioctl(struct ncr_lists *lst, unsigned int cmd, unsigned long arg_) { void __user *arg = (void __user *)arg_; |