diff options
| author | Len Brown <len.brown@intel.com> | 2004-08-06 06:35:16 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2004-08-06 06:35:16 -0400 |
| commit | 39ce7250992ee7a3bcfa050780636bdd6c601ebe (patch) | |
| tree | e20e492665f82e65c0720e564836ce3b0c8cbfb1 /include | |
| parent | c69dedacfbebfb489ae0089959e8a44b0267e0ba (diff) | |
| parent | 9f53c6cce8ef992d0806e29ddb39de3ea4baa619 (diff) | |
| download | history-39ce7250992ee7a3bcfa050780636bdd6c601ebe.tar.gz | |
Merge intel.com:/home/lenb/bk/linux-2.6.8
into intel.com:/home/lenb/src/linux-acpi-test-2.6.8
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index f8677c13b4a8f1..22dd6acdf9f1f2 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1527,7 +1527,7 @@ extern int simple_fill_super(struct super_block *, int, struct tree_descr *); extern int simple_pin_fs(char *name, struct vfsmount **mount, int *count); extern void simple_release_fs(struct vfsmount **mount, int *count); -extern ssize_t simple_read_from_buffer(void __user *, size_t, loff_t *, void *, size_t); +extern ssize_t simple_read_from_buffer(void __user *, size_t, loff_t *, const void *, size_t); extern int inode_change_ok(struct inode *, struct iattr *); extern int __must_check inode_setattr(struct inode *, struct iattr *); |