diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
| commit | 919251758195919ae3568021bc221e4f8c4b20eb (patch) | |
| tree | 81137a037ff8e6c91cc8de72d568275605c653c5 /fs/Kconfig | |
| parent | c394f1eafef61c6666f5876afde6110a276c4c9f (diff) | |
| parent | 3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a (diff) | |
Merge branch 'mainline' into upstream-linus
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 3f00a9faabcb..530581628311 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
| @@ -325,8 +325,8 @@ config FS_POSIX_ACL | |||
| 325 | source "fs/xfs/Kconfig" | 325 | source "fs/xfs/Kconfig" |
| 326 | 326 | ||
| 327 | config OCFS2_FS | 327 | config OCFS2_FS |
| 328 | tristate "OCFS2 file system support (EXPERIMENTAL)" | 328 | tristate "OCFS2 file system support" |
| 329 | depends on NET && SYSFS && EXPERIMENTAL | 329 | depends on NET && SYSFS |
| 330 | select CONFIGFS_FS | 330 | select CONFIGFS_FS |
| 331 | select JBD | 331 | select JBD |
| 332 | select CRC32 | 332 | select CRC32 |