Merge ARM fixes

[karo-tx-linux.git] / include / linux / mpage.h

diff --git a/include/linux/mpage.h b/include/linux/mpage.h
index dea1b0083661c146be748832046fd00483690818..cc5fb75af78a25e22c55ba868e4612e09331fbe1 100644 (file)
--- 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);
@@ -20,12 +21,5 @@ int mpage_writepages(struct address_space *mapping,
                struct writeback_control *wbc, get_block_t get_block);
 int mpage_writepage(struct page *page, get_block_t *get_block,
                struct writeback_control *wbc);
-int __mpage_writepages(struct address_space *mapping,
-               struct writeback_control *wbc, get_block_t get_block,
-               writepage_t writepage);
 
-static inline int
-generic_writepages(struct address_space *mapping, struct writeback_control *wbc)
-{
-       return mpage_writepages(mapping, wbc, NULL);
-}
+#endif