Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / s390 / char / monreader.c

diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c
index e021ec663ef9bf140283ebe5a7b698f01438bfb6..5b8b8592d311b4a0c3e7df7ecdb0842821907640 100644 (file)
--- a/drivers/s390/char/monreader.c
+++ b/drivers/s390/char/monreader.c
@@ -447,6 +447,7 @@ static const struct file_operations mon_fops = {
        .release = &mon_close,
        .read    = &mon_read,
        .poll    = &mon_poll,
+       .llseek  = noop_llseek,
 };
 
 static struct miscdevice mon_dev = {