diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /fs/freevxfs/vxfs_subr.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'fs/freevxfs/vxfs_subr.c')
| -rw-r--r-- | fs/freevxfs/vxfs_subr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/freevxfs/vxfs_subr.c b/fs/freevxfs/vxfs_subr.c index c1be118fc067..decac62efe57 100644 --- a/fs/freevxfs/vxfs_subr.c +++ b/fs/freevxfs/vxfs_subr.c | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | static int vxfs_readpage(struct file *, struct page *); | 42 | static int vxfs_readpage(struct file *, struct page *); |
| 43 | static sector_t vxfs_bmap(struct address_space *, sector_t); | 43 | static sector_t vxfs_bmap(struct address_space *, sector_t); |
| 44 | 44 | ||
| 45 | struct address_space_operations vxfs_aops = { | 45 | const struct address_space_operations vxfs_aops = { |
| 46 | .readpage = vxfs_readpage, | 46 | .readpage = vxfs_readpage, |
| 47 | .bmap = vxfs_bmap, | 47 | .bmap = vxfs_bmap, |
| 48 | .sync_page = block_sync_page, | 48 | .sync_page = block_sync_page, |