Merge branch 'master'

[sfrench/cifs-2.6.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index 3a32f3f97e9bda68e2bdb42bdee3fea25f1f39a2..14bcce80034670922f87d5de16efeea1a4390da7 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -884,8 +884,6 @@ config CONFIGFS_FS
          Both sysfs and configfs can and should exist together on the
          same system. One is not a replacement for the other.
 
-         If unsure, say N.
-
 endmenu
 
 menu "Miscellaneous filesystems"
@@ -1328,7 +1326,7 @@ config UFS_FS
 
 config UFS_FS_WRITE
        bool "UFS file system write support (DANGEROUS)"
-       depends on UFS_FS && EXPERIMENTAL
+       depends on UFS_FS && EXPERIMENTAL && BROKEN
        help
          Say Y here if you want to try writing to UFS partitions. This is
          experimental, so you should back up your UFS partitions beforehand.