Merge master.kernel.org:/home/rmk/linux-2.6-mmc

[linux-2.6-omap-h63xx.git] / mm / filemap.h

diff --git a/mm/filemap.h b/mm/filemap.h
index c2d0546a57eb232790ef9e9c1e25c3f00fce22a9..13793ba0ce172714355abee0ddd3291622370461 100644 (file)
--- a/mm/filemap.h
+++ b/mm/filemap.h
@@ -15,7 +15,7 @@
 #include <linux/config.h>
 #include <asm/uaccess.h>
 
-extern size_t
+size_t
 __filemap_copy_from_user_iovec(char *vaddr,
                               const struct iovec *iov,
                               size_t base,