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

[linux-2.6] / fs / inode.c

diff --git a/fs/inode.c b/fs/inode.c
index 108138d4e909301ed1e6389bb3132127fdb9e4b4..d0be6159eb7fcd4ab65f82d6dc3f0cc353b51d94 100644 (file)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1179,7 +1179,7 @@ EXPORT_SYMBOL(bmap);
 /**
  *     touch_atime     -       update the access time
  *     @mnt: mount the inode is accessed on
- *     @inode: inode accessed
+ *     @dentry: dentry accessed
  *
  *     Update the accessed time on an inode and mark it for writeback.
  *     This function automatically handles read only file systems and media,