diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /fs/Kconfig | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'fs/Kconfig')
| -rw-r--r-- | fs/Kconfig | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index 9a4158f2a3ac..e207be68d4ca 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
| @@ -859,18 +859,6 @@ config RAMFS | |||
| 859 | To compile this as a module, choose M here: the module will be called | 859 | To compile this as a module, choose M here: the module will be called |
| 860 | ramfs. | 860 | ramfs. |
| 861 | 861 | ||
| 862 | config RELAYFS_FS | ||
| 863 | tristate "Relayfs file system support" | ||
| 864 | ---help--- | ||
| 865 | Relayfs is a high-speed data relay filesystem designed to provide | ||
| 866 | an efficient mechanism for tools and facilities to relay large | ||
| 867 | amounts of data from kernel space to user space. | ||
| 868 | |||
| 869 | To compile this code as a module, choose M here: the module will be | ||
| 870 | called relayfs. | ||
| 871 | |||
| 872 | If unsure, say N. | ||
| 873 | |||
| 874 | config CONFIGFS_FS | 862 | config CONFIGFS_FS |
| 875 | tristate "Userspace-driven configuration filesystem (EXPERIMENTAL)" | 863 | tristate "Userspace-driven configuration filesystem (EXPERIMENTAL)" |
| 876 | depends on EXPERIMENTAL | 864 | depends on EXPERIMENTAL |