summaryrefslogtreecommitdiffstats
path: root/fs/Config.in
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-08-28 22:00:09 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-08-28 22:00:09 +0000
commit1a1d77dd589de5a567fa95e36aa6999c704ceca4 (patch)
tree141e31f89f18b9fe0831f31852e0435ceaccafc5 /fs/Config.in
parentfb9c690a18b3d66925a65b17441c37fa14d4370b (diff)
Merge with 2.4.0-test7.
Diffstat (limited to 'fs/Config.in')
-rw-r--r--fs/Config.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/Config.in b/fs/Config.in
index e48f75496..183aab8f8 100644
--- a/fs/Config.in
+++ b/fs/Config.in
@@ -99,7 +99,9 @@ if [ "$CONFIG_NET" = "y" ]; then
fi
dep_tristate 'SMB file system support (to mount Windows shares etc.)' CONFIG_SMB_FS $CONFIG_INET
-
+ if [ "$CONFIG_SMB_FS" != "n" ]; then
+ string 'Default Remote NLS Option' CONFIG_SMB_NLS_REMOTE ""
+ fi
if [ "$CONFIG_IPX" != "n" -o "$CONFIG_INET" != "n" ]; then
tristate 'NCP file system support (to mount NetWare volumes)' CONFIG_NCP_FS
source fs/ncpfs/Config.in