Merge branch 'next' into upstream-merge

[cascardo/linux.git] / drivers / char / istallion.c

diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index be28391..667abd2 100644 (file)
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -704,6 +704,7 @@ static const struct file_operations stli_fsiomem = {
        .read           = stli_memread,
        .write          = stli_memwrite,
        .unlocked_ioctl = stli_memioctl,
+       .llseek         = default_llseek,
 };
 
 /*****************************************************************************/