Merge branch 'master' into csb1725

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

diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c
index 539045acaad42875e03f7225f0249b55251c8e30..e090a307fdeee341c66502d75ade8edf58f13afe 100644 (file)
--- a/drivers/s390/char/tape_char.c
+++ b/drivers/s390/char/tape_char.c
@@ -17,7 +17,6 @@
 #include <linux/types.h>
 #include <linux/proc_fs.h>
 #include <linux/mtio.h>
-#include <linux/smp_lock.h>
 #include <linux/compat.h>
 
 #include <asm/uaccess.h>
@@ -53,6 +52,7 @@ static const struct file_operations tape_fops =
 #endif
        .open = tapechar_open,
        .release = tapechar_release,
+       .llseek = no_llseek,
 };
 
 static int tapechar_major = TAPECHAR_MAJOR;