Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / char / istallion.c

diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index be28391adb79b7de338594ad0a9cd5d865de5fdf..7c6de4c92458ded21561df8d75e6f92e5c6f6945 100644 (file)
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -21,7 +21,6 @@
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/interrupt.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
@@ -704,6 +703,7 @@ static const struct file_operations stli_fsiomem = {
        .read           = stli_memread,
        .write          = stli_memwrite,
        .unlocked_ioctl = stli_memioctl,
+       .llseek         = default_llseek,
 };
 
 /*****************************************************************************/