diff options
| author | Steven Whitehouse <steve@men-an-tol.chygwyn.com> | 2006-02-23 04:49:43 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-02-23 04:49:43 -0500 |
| commit | d35462b4bb847b68321c55e95c926aa485aecce2 (patch) | |
| tree | b08e18bf6e672633402871ee763102fdb5e63229 /fs/Kconfig | |
| parent | 91ffd7db71e7451f89941a8f428b4daa2a7c1e38 (diff) | |
| parent | 9e956c2dac9bec602ed1ba29181b45ba6d2b6448 (diff) | |
Merge branch 'master'
Diffstat (limited to 'fs/Kconfig')
| -rw-r--r-- | fs/Kconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index 3a32f3f97e9b..14bcce800346 100644 --- a/fs/Kconfig +++ b/fs/Kconfig | |||
| @@ -884,8 +884,6 @@ config CONFIGFS_FS | |||
| 884 | Both sysfs and configfs can and should exist together on the | 884 | Both sysfs and configfs can and should exist together on the |
| 885 | same system. One is not a replacement for the other. | 885 | same system. One is not a replacement for the other. |
| 886 | 886 | ||
| 887 | If unsure, say N. | ||
| 888 | |||
| 889 | endmenu | 887 | endmenu |
| 890 | 888 | ||
| 891 | menu "Miscellaneous filesystems" | 889 | menu "Miscellaneous filesystems" |
| @@ -1328,7 +1326,7 @@ config UFS_FS | |||
| 1328 | 1326 | ||
| 1329 | config UFS_FS_WRITE | 1327 | config UFS_FS_WRITE |
| 1330 | bool "UFS file system write support (DANGEROUS)" | 1328 | bool "UFS file system write support (DANGEROUS)" |
| 1331 | depends on UFS_FS && EXPERIMENTAL | 1329 | depends on UFS_FS && EXPERIMENTAL && BROKEN |
| 1332 | help | 1330 | help |
| 1333 | Say Y here if you want to try writing to UFS partitions. This is | 1331 | Say Y here if you want to try writing to UFS partitions. This is |
| 1334 | experimental, so you should back up your UFS partitions beforehand. | 1332 | experimental, so you should back up your UFS partitions beforehand. |