summaryrefslogtreecommitdiffstats
path: root/fs/Kconfig
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-03-31 15:34:58 -0500
committerSteven Whitehouse <swhiteho@redhat.com>2006-03-31 15:34:58 -0500
commit86579dd06deecfa6ac88d5e84e4d63c397cd6f6d (patch)
treeb4475d3ccde53015ad84a06e4e55e64591171b75 /fs/Kconfig
parent7ea9ea832212c4a755650f7c7cc1ff0b63292a41 (diff)
parenta0f067802576d4eb4c65d40b8ee7d6ea3c81dd61 (diff)
downloadop-kernel-dev-86579dd06deecfa6ac88d5e84e4d63c397cd6f6d.zip
op-kernel-dev-86579dd06deecfa6ac88d5e84e4d63c397cd6f6d.tar.gz
Merge branch 'master'
Diffstat (limited to 'fs/Kconfig')
-rw-r--r--fs/Kconfig13
1 files changed, 1 insertions, 12 deletions
diff --git a/fs/Kconfig b/fs/Kconfig
index 14bcce8..62ee097 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -860,18 +860,6 @@ config RAMFS
To compile this as a module, choose M here: the module will be called
ramfs.
-config RELAYFS_FS
- tristate "Relayfs file system support"
- ---help---
- Relayfs is a high-speed data relay filesystem designed to provide
- an efficient mechanism for tools and facilities to relay large
- amounts of data from kernel space to user space.
-
- To compile this code as a module, choose M here: the module will be
- called relayfs.
-
- If unsure, say N.
-
config CONFIGFS_FS
tristate "Userspace-driven configuration filesystem (EXPERIMENTAL)"
depends on EXPERIMENTAL
@@ -1568,6 +1556,7 @@ config RPCSEC_GSS_SPKM3
select CRYPTO
select CRYPTO_MD5
select CRYPTO_DES
+ select CRYPTO_CAST5
help
Provides for secure RPC calls by means of a gss-api
mechanism based on the SPKM3 public-key mechanism.
OpenPOWER on IntegriCloud