Merge master.kernel.org:/home/rmk/linux-2.6-serial

[linux.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index ef78e3a42d322c5435fc200f93f5c93a18ddc75f..e9749b0eecd8a27e5a1d09ece2eee57e63c14529 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -883,8 +883,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"
@@ -1327,7 +1325,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.