Merge 'staging-next' to Linus's tree

[net-next-2.6.git] / drivers / staging / comedi / comedi_fops.c

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 98fa255d862ef9f7e3257ad3eaadfd4fb1053374..093032ba521a2eb0499d51cdeae9d6dc7666870e 100644 (file)
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -1923,6 +1923,7 @@ const struct file_operations comedi_fops = {
        .mmap = comedi_mmap,
        .poll = comedi_poll,
        .fasync = comedi_fasync,
+       .llseek = noop_llseek,
 };
 
 struct class *comedi_class;