Merge 'staging-next' to Linus's tree

[sfrench/cifs-2.6.git] / drivers / staging / lirc / lirc_sasem.c

diff --git a/drivers/staging/lirc/lirc_sasem.c b/drivers/staging/lirc/lirc_sasem.c
index 2e681cf3e85da8a957624467ff7d8c25feb605d2..998485ebdbceb136c764449b3667872b32cc5090 100644 (file)
--- a/drivers/staging/lirc/lirc_sasem.c
+++ b/drivers/staging/lirc/lirc_sasem.c
@@ -125,6 +125,7 @@ static const struct file_operations vfd_fops = {
        .write          = &vfd_write,
        .unlocked_ioctl = &vfd_ioctl,
        .release        = &vfd_close,
+       .llseek         = noop_llseek,
 };
 
 /* USB Device ID for Sasem USB Control Board */