summaryrefslogtreecommitdiffstats
path: root/fs/Config.in
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-06-17 13:25:08 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-06-17 13:25:08 +0000
commit59223edaa18759982db0a8aced0e77457d10c68e (patch)
tree89354903b01fa0a447bffeefe00df3044495db2e /fs/Config.in
parentdb7d4daea91e105e3859cf461d7e53b9b77454b2 (diff)
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'fs/Config.in')
-rw-r--r--fs/Config.in19
1 files changed, 9 insertions, 10 deletions
diff --git a/fs/Config.in b/fs/Config.in
index d9c8c08cd..515a6ae9a 100644
--- a/fs/Config.in
+++ b/fs/Config.in
@@ -19,6 +19,10 @@ dep_tristate ' MSDOS fs support' CONFIG_MSDOS_FS $CONFIG_FAT_FS
dep_tristate ' UMSDOS: Unix-like filesystem on top of standard MSDOS filesystem' CONFIG_UMSDOS_FS $CONFIG_MSDOS_FS
dep_tristate ' VFAT (Windows-95) fs support' CONFIG_VFAT_FS $CONFIG_FAT_FS
+if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
+ tristate 'EFS filesystem support (read only) (experimental)' CONFIG_EFS_FS
+fi
+
tristate 'ISO 9660 CDROM filesystem support' CONFIG_ISO9660_FS
if [ "$CONFIG_ISO9660_FS" != "n" ]; then
bool 'Microsoft Joliet CDROM extensions' CONFIG_JOLIET
@@ -32,7 +36,7 @@ tristate 'NTFS filesystem support (read only)' CONFIG_NTFS_FS
if [ "$CONFIG_NTFS_FS" != "n" -a "$CONFIG_EXPERIMENTAL" = "y" ]; then
bool ' NTFS read-write support (DANGEROUS)' CONFIG_NTFS_RW
fi
-tristate 'OS/2 HPFS filesystem support (read only)' CONFIG_HPFS_FS
+tristate 'OS/2 HPFS filesystem support (read/write) (NEW)' CONFIG_HPFS_FS
bool '/proc filesystem support' CONFIG_PROC_FS
if [ "$CONFIG_UNIX98_PTYS" = "y" ]; then
# It compiles as a module for testing only. It should not be used
@@ -54,12 +58,6 @@ tristate 'UFS filesystem support' CONFIG_UFS_FS
if [ "$CONFIG_UFS_FS" != "n" ]; then
bool ' UFS filesystem write support (experimental)' CONFIG_UFS_FS_WRITE
fi
-if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- tristate 'SGI EFS filesystem support (read only) (experimental)' CONFIG_EFS_FS
- if [ "$CONFIG_EFS_FS" != "n" ]; then
- define_bool CONFIG_SGI_PARTITION y
- fi
-fi
if [ "$CONFIG_NET" = "y" ]; then
@@ -74,9 +72,9 @@ if [ "$CONFIG_INET" = "y" ]; then
fi
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
tristate 'NFS server support' CONFIG_NFSD
- fi
- if [ "$CONFIG_NFSD" != "n" ]; then
- bool ' Emulate SUN NFS server' CONFIG_NFSD_SUN
+ if [ "$CONFIG_NFSD" != "n" ]; then
+ bool ' Emulate SUN NFS server' CONFIG_NFSD_SUN
+ fi
fi
if [ "$CONFIG_NFS_FS" = "y" -o "$CONFIG_NFSD" = "y" ]; then
define_bool CONFIG_SUNRPC y
@@ -113,6 +111,7 @@ bool 'Macintosh partition map support' CONFIG_MAC_PARTITION
bool 'OSF partition table support' CONFIG_OSF_PARTITION
bool 'SMD disklabel (Sun partition tables) support' CONFIG_SMD_DISKLABEL
bool 'Solaris (x86) partition table support' CONFIG_SOLARIS_X86_PARTITION
+bool 'SGI disklabel support' CONFIG_SGI_DISKLABEL
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
bool 'Ultrix partition table support (experimental)' CONFIG_ULTRIX_PARTITION
bool 'Unixware slices support (EXPERIMENTAL)' CONFIG_UNIXWARE_DISKLABEL