From: Ian Abbott <abbotti@mev.co.uk>
Date: Fri, 8 Oct 2010 14:30:02 +0000 (+0000)
Subject: serial2002: old 'ioctl' file operation removed in 2.6.36.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=85537f846d9246c08ade1c48bafc365d086ad9d6;p=comedi.git

serial2002: old 'ioctl' file operation removed in 2.6.36.
---

diff --git a/comedi/drivers/serial2002.c b/comedi/drivers/serial2002.c
index 3cb817a1..c0335f47 100644
--- a/comedi/drivers/serial2002.c
+++ b/comedi/drivers/serial2002.c
@@ -122,9 +122,11 @@ static long tty_ioctl(struct file *f, unsigned op, unsigned long param)
 		return f->f_op->unlocked_ioctl(f, op, param);
 	}
 #endif    
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
 	if (f->f_op->ioctl) {
 	  	return f->f_op->ioctl(f->f_dentry->d_inode, f, op, param);
 	}
+#endif
 	return -ENOSYS;
 }