Merge branch 'atmel'

[linux-2.6] / Documentation / filesystems / ext2.txt

diff --git a/Documentation/filesystems/ext2.txt b/Documentation/filesystems/ext2.txt
index b5cb9110cc6b9d8d9db01c69d66a1f78ce4f0d89..a8edb376b04191654b6ab9a868c4cb529a65176b 100644 (file)
--- a/Documentation/filesystems/ext2.txt
+++ b/Documentation/filesystems/ext2.txt
@@ -17,8 +17,6 @@ set using tune2fs(8). Kernel-determined defaults are indicated by (*).
 bsddf                  (*)     Makes `df' act like BSD.
 minixdf                                Makes `df' act like Minix.
 
-check                          Check block and inode bitmaps at mount time
-                               (requires CONFIG_EXT2_CHECK).
 check=none, nocheck    (*)     Don't do extra checking of bitmaps on mount
                                (check=normal and check=strict options removed)
 
@@ -58,6 +56,8 @@ noacl                         Don't support POSIX ACLs.
 
 nobh                           Do not attach buffer_heads to file pagecache.
 
+xip                            Use execute in place (no caching) if possible
+
 grpquota,noquota,quota,usrquota        Quota options are silently ignored by ext2.