Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c
index 857dfcb7b359..f6489eb7e976 100644
--- a/drivers/s390/char/fs3270.c
+++ b/drivers/s390/char/fs3270.c
@@ -14,7 +14,6 @@
 #include <linux/list.h>
 #include <linux/slab.h>
 #include <linux/types.h>
-#include <linux/smp_lock.h>
 
 #include <asm/compat.h>
 #include <asm/ccwdev.h>
@@ -520,6 +519,7 @@ static const struct file_operations fs3270_fops = {
         .compat_ioctl    = fs3270_ioctl,        /* ioctl */
         .open            = fs3270_open,         /* open */
         .release         = fs3270_close,        /* release */
+        .llseek         = no_llseek,
 };
 
 /*