aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2010-10-07 12:12:52 +0000
committerMichael Büsch <mb@bu3sch.de>2010-10-07 12:12:52 +0000
commita33e8dc2514ce43b2a930da0ee7e639cc2dedb33 (patch)
tree3b3793182f667ea49ca515f6bc2a3768e5d2f895 /target/linux
parent159e10820e11ef700be66cdb30a27e02ef81852e (diff)
downloadupstream-a33e8dc2514ce43b2a930da0ee7e639cc2dedb33.tar.gz
upstream-a33e8dc2514ce43b2a930da0ee7e639cc2dedb33.tar.bz2
upstream-a33e8dc2514ce43b2a930da0ee7e639cc2dedb33.zip
cryptodev: Compilefix on 2.6.36
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23290 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/files/crypto/ocf/cryptodev.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/target/linux/generic/files/crypto/ocf/cryptodev.c b/target/linux/generic/files/crypto/ocf/cryptodev.c
index 87a4c379d4..c1e9140a05 100644
--- 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