Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / staging / memrar / memrar_handler.c

diff --git a/drivers/staging/memrar/memrar_handler.c b/drivers/staging/memrar/memrar_handler.c
index a98b3f1f11e00a11293c548b2389ed684714c818..cfcaa8e5b8e619a8a1bfb4baa131c1a0fad49a7e 100644 (file)
--- a/drivers/staging/memrar/memrar_handler.c
+++ b/drivers/staging/memrar/memrar_handler.c
@@ -890,6 +890,7 @@ static const struct file_operations memrar_fops = {
        .mmap           = memrar_mmap,
        .open           = memrar_open,
        .release        = memrar_release,
+       .llseek         = no_llseek,
 };
 
 static struct miscdevice memrar_miscdev = {