diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-08-31 03:45:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-08-31 03:45:46 -0400 |
| commit | daab7fc734a53fdeaf844b7c03053118ad1769da (patch) | |
| tree | 575deb3cdcc6dda562acaed6f7c29bc81ae01cf2 /fs/afs/Kconfig | |
| parent | 774ea0bcb27f57b6fd521b3b6c43237782fed4b9 (diff) | |
| parent | 2bfc96a127bc1cc94d26bfaa40159966064f9c8c (diff) | |
Merge commit 'v2.6.36-rc3' into x86/memblock
Conflicts:
arch/x86/kernel/trampoline.c
mm/memblock.c
Merge reason: Resolve the conflicts, update to latest upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/afs/Kconfig')
| -rw-r--r-- | fs/afs/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/afs/Kconfig b/fs/afs/Kconfig index 5c4e61d3c772..8f975f25b486 100644 --- a/fs/afs/Kconfig +++ b/fs/afs/Kconfig | |||
| @@ -2,6 +2,7 @@ config AFS_FS | |||
| 2 | tristate "Andrew File System support (AFS) (EXPERIMENTAL)" | 2 | tristate "Andrew File System support (AFS) (EXPERIMENTAL)" |
| 3 | depends on INET && EXPERIMENTAL | 3 | depends on INET && EXPERIMENTAL |
| 4 | select AF_RXRPC | 4 | select AF_RXRPC |
| 5 | select DNS_RESOLVER | ||
| 5 | help | 6 | help |
| 6 | If you say Y here, you will get an experimental Andrew File System | 7 | If you say Y here, you will get an experimental Andrew File System |
| 7 | driver. It currently only supports unsecured read-only AFS access. | 8 | driver. It currently only supports unsecured read-only AFS access. |