Merge 'staging-next' to Linus's tree

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

diff --git a/drivers/staging/lirc/lirc_imon.c b/drivers/staging/lirc/lirc_imon.c
index f763ec891ecb8391606e39f66669d2ba90fcc5b8..0da6b9518af9ea4e068051ca24706e97aa917faa 100644 (file)
--- a/drivers/staging/lirc/lirc_imon.c
+++ b/drivers/staging/lirc/lirc_imon.c
@@ -115,7 +115,8 @@ static const struct file_operations display_fops = {
        .owner          = THIS_MODULE,
        .open           = &display_open,
        .write          = &vfd_write,
-       .release        = &display_close
+       .release        = &display_close,
+       .llseek         = noop_llseek,
 };
 
 /*