Fix for 2.6.10 and earlier. Rename comedi_compat_ioctl function to

comedi_compat_ioctl_ and define comedi_compat_ioctl macro to access it.
The comedi_compat_ioctl macro expands to 0 for 2.6.10 and earlier
(HAVE_COMPAT_IOCTL undefined) so it tried to define a function called '0'!

diff --git a/comedi/comedi_compat32.c b/comedi/comedi_compat32.c
index 995371a28e2d835cd563d90c31d768ec397d241a..ac3c60ff6298f8d1f6a1848c6b14e9b09b6a97c0 100644 (file)
--- a/comedi/comedi_compat32.c
+++ b/comedi/comedi_compat32.c
@@ -428,7 +428,9 @@ static int compat_insn(struct file *file, unsigned long arg)
        return translated_ioctl(file, COMEDI_INSN, (unsigned long)insn);
 }
 
-long comedi_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+/* compat_ioctl file operation. */
+long comedi_compat_ioctl_(struct file *file, unsigned int cmd,
+               unsigned long arg)
 {
        int rc;
 
@@ -495,7 +497,7 @@ static int mapped_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg,
        if (imajor(file->f_dentry->d_inode) != COMEDI_MAJOR) {
                return -ENOTTY;
        }
-       rc = (int)comedi_compat_ioctl(file, cmd, arg);
+       rc = (int)comedi_compat_ioctl_(file, cmd, arg);
        if (rc == -ENOIOCTLCMD) {
                rc = -ENOTTY;
        }

diff --git a/comedi/comedi_compat32.h b/comedi/comedi_compat32.h
index 198aea5476f9151a6460737bf4c70cf13ce53478..8f556ee868525098b48fc0a86bd2600f0035570f 100644 (file)
--- a/comedi/comedi_compat32.h
+++ b/comedi/comedi_compat32.h
@@ -34,8 +34,9 @@
 
 #ifdef HAVE_COMPAT_IOCTL
 
-extern long comedi_compat_ioctl(struct file *file, unsigned int cmd,
+extern long comedi_compat_ioctl_(struct file *file, unsigned int cmd,
                unsigned long arg);
+#define comedi_compat_ioctl comedi_compat_ioctl_
 #define comedi_register_ioctl32() do{}while(0)
 #define comedi_unregister_ioctl32() do{}while(0)