diff options
| author | James Bottomley <jejb@sparkweed.localdomain> | 2006-09-23 22:03:52 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@sparkweed.localdomain> | 2006-09-23 22:03:52 -0400 |
| commit | 1aedf2ccc60fade26c46fae12e28664d0da3f199 (patch) | |
| tree | d91083e3079f1ddb942a382ac2b5a7525570ad59 /fs/Kconfig | |
| parent | dfdc58ba354adb80d67c99f7be84f95a8e02e466 (diff) | |
| parent | 1ab9dd0902df4f4ff56fbf672220549090ab28ba (diff) | |
Merge mulgrave-w:git/linux-2.6
Conflicts:
include/linux/blkdev.h
Trivial merge to incorporate tag prototypes.
Diffstat (limited to 'fs/Kconfig')
| -rw-r--r-- | fs/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index 530581628311..a27002668bd3 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
| @@ -1471,8 +1471,8 @@ config NFS_V4 | |||
| 1471 | If unsure, say N. | 1471 | If unsure, say N. |
| 1472 | 1472 | ||
| 1473 | config NFS_DIRECTIO | 1473 | config NFS_DIRECTIO |
| 1474 | bool "Allow direct I/O on NFS files (EXPERIMENTAL)" | 1474 | bool "Allow direct I/O on NFS files" |
| 1475 | depends on NFS_FS && EXPERIMENTAL | 1475 | depends on NFS_FS |
| 1476 | help | 1476 | help |
| 1477 | This option enables applications to perform uncached I/O on files | 1477 | This option enables applications to perform uncached I/O on files |
| 1478 | in NFS file systems using the O_DIRECT open() flag. When O_DIRECT | 1478 | in NFS file systems using the O_DIRECT open() flag. When O_DIRECT |