diff --git a/[refs] b/[refs] index 791afa8070fd..a1f0df9fa583 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8f484d1b6677dd5cd5e7e605db747e8c30bbd47 +refs/heads/master: 38e3eaeedcac75360af8a92e7b66956ec4f334e5 diff --git a/trunk/fs/ecryptfs/file.c b/trunk/fs/ecryptfs/file.c index 9e944057001b..3efc7fdc3c39 100644 --- a/trunk/fs/ecryptfs/file.c +++ b/trunk/fs/ecryptfs/file.c @@ -299,7 +299,6 @@ static int ecryptfs_ioctl(struct inode *inode, struct file *file, const struct file_operations ecryptfs_dir_fops = { .readdir = ecryptfs_readdir, .ioctl = ecryptfs_ioctl, - .mmap = generic_file_mmap, .open = ecryptfs_open, .flush = ecryptfs_flush, .release = ecryptfs_release,