diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-08-07 03:26:43 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-07 03:26:43 +0200 |
| commit | cc25c8544e3b427dc25a825a6904e00a3170d001 (patch) | |
| tree | 79d681043f9a789ef1af4dc8d36e9301df889264 /cryptodev_main.c | |
| parent | 0970369455d02b2fe40567ac4cc93d1250b47bab (diff) | |
| parent | cb519ef9fc39d3ccb1272ec7685524443490ca54 (diff) | |
| download | cryptodev-linux-cc25c8544e3b427dc25a825a6904e00a3170d001.tar.gz cryptodev-linux-cc25c8544e3b427dc25a825a6904e00a3170d001.tar.xz cryptodev-linux-cc25c8544e3b427dc25a825a6904e00a3170d001.zip | |
Merge branch 'bugfixes'
Conflicts:
ncr-int.h
Diffstat (limited to 'cryptodev_main.c')
| -rw-r--r-- | cryptodev_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cryptodev_main.c b/cryptodev_main.c index 3223acd..a056b44 100644 --- a/cryptodev_main.c +++ b/cryptodev_main.c @@ -34,12 +34,12 @@ #include <linux/crypto.h> #include <linux/mm.h> #include <linux/highmem.h> +#include <linux/ioctl.h> #include <linux/random.h> #include <linux/syscalls.h> #include <linux/pagemap.h> +#include <linux/uaccess.h> #include "cryptodev.h" -#include <asm/uaccess.h> -#include <asm/ioctl.h> #include <linux/scatterlist.h> #include "cryptodev_int.h" #include "ncr-int.h" @@ -951,7 +951,7 @@ cryptodev_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg_) #endif /* CONFIG_COMPAT */ -static struct file_operations cryptodev_fops = { +static const struct file_operations cryptodev_fops = { .owner = THIS_MODULE, .open = cryptodev_open, .release = cryptodev_release, |