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

[mv-sheeva.git] / fs / ecryptfs / miscdev.c

diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
index 00208c3d7e926cf799974ef23d5bdaebd72151c8..940a82e63dc3fcdc52797f9176842fdbf391d272 100644 (file)
--- a/fs/ecryptfs/miscdev.c
+++ b/fs/ecryptfs/miscdev.c
@@ -482,6 +482,7 @@ static const struct file_operations ecryptfs_miscdev_fops = {
        .read    = ecryptfs_miscdev_read,
        .write   = ecryptfs_miscdev_write,
        .release = ecryptfs_miscdev_release,
+       .llseek  = noop_llseek,
 };
 
 static struct miscdevice ecryptfs_miscdev = {