Merge branch 'master' into csb1725

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

diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c
index 572a1e7fd099f5da539f070a1ba3475f26ad338d..e0702d3ea33ba669223b5237f3a60acba8cfa35e 100644 (file)
--- a/drivers/s390/char/monwriter.c
+++ b/drivers/s390/char/monwriter.c
@@ -274,6 +274,7 @@ static const struct file_operations monwrite_fops = {
        .open    = &monwrite_open,
        .release = &monwrite_close,
        .write   = &monwrite_write,
+       .llseek  = noop_llseek,
 };
 
 static struct miscdevice mon_dev = {