diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:22:31 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-21 17:22:31 +0200 |
| commit | 32a82e38679501da738199135b35f93ddc8aca0a (patch) | |
| tree | ed280e079a8bab790b3dba5f62f1d300ada7540b /target/linux/config/Config.in.fsnet | |
| parent | 90d5c8b73e8d538e121275b12e714332ca785cff (diff) | |
| parent | 86c05906d3e804b41b9280c226a3a07f6fad5f27 (diff) | |
resolve conflicts
Diffstat (limited to 'target/linux/config/Config.in.fsnet')
| -rw-r--r-- | target/linux/config/Config.in.fsnet | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet index 77871f171..c22ae210c 100644 --- a/target/linux/config/Config.in.fsnet +++ b/target/linux/config/Config.in.fsnet @@ -3,7 +3,7 @@ config ADK_KERNEL_FS_POSIX_ACL default y config ADK_KPACKAGE_KMOD_CIFS - prompt "kmod-fs-cifs...................... CIFS support" + prompt "kmod-cifs......................... CIFS support" tristate select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS select ADK_KERNEL_NETWORK_FILESYSTEMS |