comedi_compat32: old 'ioctl' file operation removed in 2.6.36.
authorIan Abbott <abbotti@mev.co.uk>
Fri, 8 Oct 2010 11:10:02 +0000 (11:10 +0000)
committerIan Abbott <abbotti@mev.co.uk>
Fri, 8 Oct 2010 11:10:02 +0000 (11:10 +0000)
comedi/comedi_compat32.c

index 4dedc967c82cdb40fcc544038226f4888fd3f33c..6156f77d904d8434f28b5ff9c21b37d87789db63 100644 (file)
@@ -110,6 +110,7 @@ static int translated_ioctl(struct file *file, unsigned int cmd,
                return rc;
        }
 #endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
        if (file->f_op->ioctl) {
                int rc;
                lock_kernel();
@@ -118,6 +119,7 @@ static int translated_ioctl(struct file *file, unsigned int cmd,
                unlock_kernel();
                return rc;
        }
+#endif
        return -ENOTTY;
 }