Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle...

[linux-beck.git] / drivers / s390 / char / fs3270.c

diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c
index 857dfcb7b35999c694bcd740d51bbb51e4bf7ecb..f6489eb7e976a8c0aa1851ebbb21901d689030c1 100644 (file)
--- 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,
 };
 
 /*