projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4c4f7be
)
cryptodev: Compilefix on 2.6.36
author
Michael Büsch
<mb@bu3sch.de>
Thu, 7 Oct 2010 12:12:52 +0000
(12:12 +0000)
committer
Michael Büsch
<mb@bu3sch.de>
Thu, 7 Oct 2010 12:12:52 +0000
(12:12 +0000)
SVN-Revision: 23290
target/linux/generic/files/crypto/ocf/cryptodev.c
patch
|
blob
|
history
diff --git
a/target/linux/generic/files/crypto/ocf/cryptodev.c
b/target/linux/generic/files/crypto/ocf/cryptodev.c
index 87a4c379d42208730dcaa1634edcb9e7110124d0..c1e9140a050be5a59f561cbcd0cc4c47dd8ebf0e 100644
(file)
--- a/
target/linux/generic/files/crypto/ocf/cryptodev.c
+++ b/
target/linux/generic/files/crypto/ocf/cryptodev.c
@@
-1019,7
+1019,9
@@
static struct file_operations cryptodev_fops = {
.owner = THIS_MODULE,
.open = cryptodev_open,
.release = cryptodev_release,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
.ioctl = cryptodev_ioctl,
+#endif
#ifdef HAVE_UNLOCKED_IOCTL
.unlocked_ioctl = cryptodev_unlocked_ioctl,
#endif