projects
/
15.05
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
159e108
)
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)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23290
3c298f89
-4303-0410-b956-
a3cf2f4a3e73
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
87a4c37
..
c1e9140
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,
.owner = THIS_MODULE,
.open = cryptodev_open,
.release = cryptodev_release,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
.ioctl = cryptodev_ioctl,
.ioctl = cryptodev_ioctl,
+#endif
#ifdef HAVE_UNLOCKED_IOCTL
.unlocked_ioctl = cryptodev_unlocked_ioctl,
#endif
#ifdef HAVE_UNLOCKED_IOCTL
.unlocked_ioctl = cryptodev_unlocked_ioctl,
#endif