diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-03-02 20:07:14 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-03-02 20:07:14 -0500 |
| commit | 12d7d4e0ed8fecf7f74c89483b55b300be6e5901 (patch) | |
| tree | f573761ac752ff04ec445e23aef50adadda49790 /fs/nilfs2/page.h | |
| parent | aca6ad073ea820776bf5bdb87cf82eace35042c8 (diff) | |
| parent | 790ab7e92bec24aee3939b300d36b99ab2e3f3ca (diff) | |
Merge branch 'devel-cleanup' into omap-for-linus
Conflicts:
arch/arm/mach-omap2/timer-gp.c
Diffstat (limited to 'fs/nilfs2/page.h')
| -rw-r--r-- | fs/nilfs2/page.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nilfs2/page.h b/fs/nilfs2/page.h index 622df27cd891..2a00953ebd5f 100644 --- a/fs/nilfs2/page.h +++ b/fs/nilfs2/page.h | |||
| @@ -61,7 +61,6 @@ void nilfs_free_private_page(struct page *); | |||
| 61 | int nilfs_copy_dirty_pages(struct address_space *, struct address_space *); | 61 | int nilfs_copy_dirty_pages(struct address_space *, struct address_space *); |
| 62 | void nilfs_copy_back_pages(struct address_space *, struct address_space *); | 62 | void nilfs_copy_back_pages(struct address_space *, struct address_space *); |
| 63 | void nilfs_clear_dirty_pages(struct address_space *); | 63 | void nilfs_clear_dirty_pages(struct address_space *); |
| 64 | void nilfs_mapping_init_once(struct address_space *mapping); | ||
| 65 | void nilfs_mapping_init(struct address_space *mapping, | 64 | void nilfs_mapping_init(struct address_space *mapping, |
| 66 | struct backing_dev_info *bdi, | 65 | struct backing_dev_info *bdi, |
| 67 | const struct address_space_operations *aops); | 66 | const struct address_space_operations *aops); |