diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:55:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:55:03 -0400 |
| commit | e993835441734c184d70d3716eed78a08eeb71c2 (patch) | |
| tree | 583aa17813cdae1c4640e353f8c6df3f197e7548 /include/linux/mpage.h | |
| parent | 360f654e7cda850034f3f6252a7a7cff3fa77356 (diff) | |
| parent | 1bdfd554be94def718323659173517c5d4a69d25 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/linux/mpage.h')
| -rw-r--r-- | include/linux/mpage.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/mpage.h b/include/linux/mpage.h index 3ca880463c47..cc5fb75af78a 100644 --- a/include/linux/mpage.h +++ b/include/linux/mpage.h @@ -9,6 +9,7 @@ * (And no, it doesn't do the #ifdef __MPAGE_H thing, and it doesn't do * nested includes. Get it right in the .c file). */ +#ifdef CONFIG_BLOCK struct writeback_control; typedef int (writepage_t)(struct page *page, struct writeback_control *wbc); @@ -21,8 +22,4 @@ int mpage_writepages(struct address_space *mapping, int mpage_writepage(struct page *page, get_block_t *get_block, struct writeback_control *wbc); -static inline int -generic_writepages(struct address_space *mapping, struct writeback_control *wbc) -{ - return mpage_writepages(mapping, wbc, NULL); -} +#endif |