From ded8ee47e0dae2010c01db1657cb307d9c04c7ff Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Fri, 8 Oct 2010 11:10:02 +0000 Subject: [PATCH] comedi_compat32: old 'ioctl' file operation removed in 2.6.36. --- comedi/comedi_compat32.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/comedi/comedi_compat32.c b/comedi/comedi_compat32.c index 4dedc967..6156f77d 100644 --- a/comedi/comedi_compat32.c +++ b/comedi/comedi_compat32.c @@ -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; } -- 2.26.2