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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c
index 539045acaad4..87cd0ab242de 100644
--- 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;
@@ -139,7 +139,7 @@ tapechar_read(struct file *filp, char __user *data, size_t count, loff_t *ppos)
         /*
          * If the tape isn't terminated yet, do it now. And since we then
          * are at the end of the tape there wouldn't be anything to read
-         * anyways. So we return immediatly.
+         * anyways. So we return immediately.
          */
         if(device->required_tapemarks) {
                 return tape_std_terminate_write(device);