summaryrefslogtreecommitdiff
path: root/target/linux/config/Config.in.fsnet
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-01-10 16:16:44 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-01-10 16:16:44 +0100
commitcfc200714ddfa6d76feb836c258b1135d91a8348 (patch)
treeecc4628fc161de5044c9acb03bb63b2fd48ae75c /target/linux/config/Config.in.fsnet
parent77bdac14df2e20b290cdd4bcad0ecb0e1fc446be (diff)
parent91c8ff1c3f772e0ae8d7c60a3252c5efced9fe92 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts: package/digitemp/Makefile
Diffstat (limited to 'target/linux/config/Config.in.fsnet')
-rw-r--r--target/linux/config/Config.in.fsnet2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet
index 78c21d52c..71236c47f 100644
--- a/target/linux/config/Config.in.fsnet
+++ b/target/linux/config/Config.in.fsnet
@@ -1,6 +1,6 @@
config ADK_KPACKAGE_KMOD_CIFS
prompt "kmod-fs-cifs...................... CIFS support"
- select ADK_KPACKAGE_KMOD_NLS
+ select ADK_KPACKAGE_KMOD_NLS if !ADK_KERNEL_NLS
tristate
default n
help