From 967c65a99059fd459b956c1588ce0ba227912c4e Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 16 Dec 1997 05:34:03 +0000 Subject: Merge with Linux 2.1.72, part 1. --- fs/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'fs/Config.in') diff --git a/fs/Config.in b/fs/Config.in index d7826af19..b8c293955 100644 --- a/fs/Config.in +++ b/fs/Config.in @@ -23,7 +23,7 @@ dep_tristate 'VFAT (Windows-95) fs support' CONFIG_VFAT_FS $CONFIG_FAT_FS bool '/proc filesystem support' CONFIG_PROC_FS if [ "$CONFIG_INET" = "y" ]; then tristate 'NFS filesystem support' CONFIG_NFS_FS - if [ "$CONFIG_NFS_FS" = "y" ]; then + if [ "$CONFIG_NFS_FS" = "y" -a "$CONFIG_IP_PNP" = "y" ]; then bool ' Root file system on NFS' CONFIG_ROOT_NFS if [ "$CONFIG_ROOT_NFS" = "y" ]; then bool ' BOOTP support' CONFIG_RNFS_BOOTP @@ -43,6 +43,7 @@ if [ "$CONFIG_INET" = "y" ]; then define_bool CONFIG_LOCKD n fi fi + tristate 'Coda filesystem support (advanced network fs)' CONFIG_CODA_FS tristate 'SMB filesystem support (to mount WfW shares etc..)' CONFIG_SMB_FS if [ "$CONFIG_SMB_FS" != "n" ]; then bool 'SMB Win95 bug work-around' CONFIG_SMB_WIN95 -- cgit v1.2.3