Merge branch 'for-linus' into for-next

[linux-2.6-block.git] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 492948ea4c9bdc426852b2461e7a10109e2699e3..c7b21db7782fd6885ea8b00b6c9fdc928cde32a1 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1569,7 +1569,7 @@ struct file_operations {
        long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
        long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
        int (*mmap) (struct file *, struct vm_area_struct *);
-       void (*mremap)(struct file *, struct vm_area_struct *);
+       int (*mremap)(struct file *, struct vm_area_struct *);
        int (*open) (struct inode *, struct file *);
        int (*flush) (struct file *, fl_owner_t id);
        int (*release) (struct inode *, struct file *);