From db7d4daea91e105e3859cf461d7e53b9b77454b2 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Sun, 13 Jun 1999 16:29:25 +0000
Subject: Merge with Linux 2.2.8.

---
 fs/nls/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'fs/nls')

diff --git a/fs/nls/Config.in b/fs/nls/Config.in
index bf17009d9..7e591b82a 100644
--- a/fs/nls/Config.in
+++ b/fs/nls/Config.in
@@ -4,7 +4,7 @@
 
 # msdos and Joliet want NLS
 if [ "$CONFIG_JOLIET" = "y" -o "$CONFIG_FAT_FS" != "n" \
-	-o "$CONFIG_NTFS_FS" != "n" ]; then
+	-o "$CONFIG_NTFS_FS" != "n" -o "$CONFIG_NCPFS_NLS" = "y" ]; then
   define_bool CONFIG_NLS y
 else
   define_bool CONFIG_NLS n
-- 
cgit v1.2.3