diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 19:20:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-27 19:20:37 -0400 |
commit | 42fae7fb1c27d230fbd48aa055a4ae6796fb0039 (patch) | |
tree | 94836c3535cf7e972cdc2ea65598fa2182b20fa3 /fs/Kconfig | |
parent | f00546363fff1576ceddc2690d47e5f9c1dd2e05 (diff) | |
parent | b8b8fd2dc23725fba77f66b3fef11b11f983fc08 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NET]: Fix networking compilation errors
[AF_RXRPC/AFS]: Arch-specific fixes.
[AFS]: Fix VLocation record update wakeup
[NET]: Revert sk_buff walker cleanups.
Diffstat (limited to 'fs/Kconfig')
-rw-r--r-- | fs/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index e33c08924572..a42f767dcdd5 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
@@ -2020,6 +2020,7 @@ config AFS_FS | |||
2020 | tristate "Andrew File System support (AFS) (EXPERIMENTAL)" | 2020 | tristate "Andrew File System support (AFS) (EXPERIMENTAL)" |
2021 | depends on INET && EXPERIMENTAL | 2021 | depends on INET && EXPERIMENTAL |
2022 | select AF_RXRPC | 2022 | select AF_RXRPC |
2023 | select KEYS | ||
2023 | help | 2024 | help |
2024 | If you say Y here, you will get an experimental Andrew File System | 2025 | If you say Y here, you will get an experimental Andrew File System |
2025 | driver. It currently only supports unsecured read-only AFS access. | 2026 | driver. It currently only supports unsecured read-only AFS access. |