Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[net-next-2.6.git] / drivers / staging / lirc / lirc_zilog.c

diff --git a/drivers/staging/lirc/lirc_zilog.c b/drivers/staging/lirc/lirc_zilog.c
index 9b77552f566e17a5fdb0c260f3d168446796483e..f0076eb025f1a0e9d412080caab87f627dda4970 100644 (file)
--- a/drivers/staging/lirc/lirc_zilog.c
+++ b/drivers/staging/lirc/lirc_zilog.c
@@ -1139,6 +1139,9 @@ static const struct file_operations lirc_fops = {
        .write          = write,
        .poll           = poll,
        .unlocked_ioctl = ioctl,
+#ifdef CONFIG_COMPAT
+       .compat_ioctl   = ioctl,
+#endif
        .open           = open,
        .release        = close
 };