Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[linux-2.6] / mm / filemap.c

diff --git a/mm/filemap.c b/mm/filemap.c
index 920366399eed6a3adb409d58622c74db46abcd7a..7c8643630023d239f099335f4a80480d5bde0a02 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -28,6 +28,7 @@
 #include <linux/backing-dev.h>
 #include <linux/pagevec.h>
 #include <linux/blkdev.h>
+#include <linux/backing-dev.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/cpuset.h>
@@ -841,7 +842,7 @@ static void shrink_readahead_size_eio(struct file *filp,
 /**
  * do_generic_mapping_read - generic file read routine
  * @mapping:   address_space to be read
- * @_ra:       file's readahead state
+ * @ra:                file's readahead state
  * @filp:      the file to read
  * @ppos:      current file position
  * @desc:      read_descriptor