diff options
| -rw-r--r-- | drivers/net/Kconfig | 3 | ||||
| -rw-r--r-- | fs/configfs/Kconfig | 4 | ||||
| -rw-r--r-- | fs/dlm/Kconfig | 3 | ||||
| -rw-r--r-- | fs/ocfs2/Kconfig | 3 |
4 files changed, 5 insertions, 8 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 4c8bfc97fb4c..16fe4f9b719b 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -3389,8 +3389,7 @@ config NETCONSOLE | |||
| 3389 | 3389 | ||
| 3390 | config NETCONSOLE_DYNAMIC | 3390 | config NETCONSOLE_DYNAMIC |
| 3391 | bool "Dynamic reconfiguration of logging targets" | 3391 | bool "Dynamic reconfiguration of logging targets" |
| 3392 | depends on NETCONSOLE && SYSFS | 3392 | depends on NETCONSOLE && SYSFS && CONFIGFS_FS |
| 3393 | select CONFIGFS_FS | ||
| 3394 | help | 3393 | help |
| 3395 | This option enables the ability to dynamically reconfigure target | 3394 | This option enables the ability to dynamically reconfigure target |
| 3396 | parameters (interface, IP addresses, port numbers, MAC addresses) | 3395 | parameters (interface, IP addresses, port numbers, MAC addresses) |
diff --git a/fs/configfs/Kconfig b/fs/configfs/Kconfig index 13587cc97a0b..9febcdefdfdc 100644 --- a/fs/configfs/Kconfig +++ b/fs/configfs/Kconfig | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | config CONFIGFS_FS | 1 | config CONFIGFS_FS |
| 2 | tristate "Userspace-driven configuration filesystem" | 2 | tristate "Userspace-driven configuration filesystem" |
| 3 | depends on SYSFS | 3 | select SYSFS |
| 4 | help | 4 | help |
| 5 | configfs is a ram-based filesystem that provides the converse | 5 | configfs is a RAM-based filesystem that provides the converse |
| 6 | of sysfs's functionality. Where sysfs is a filesystem-based | 6 | of sysfs's functionality. Where sysfs is a filesystem-based |
| 7 | view of kernel objects, configfs is a filesystem-based manager | 7 | view of kernel objects, configfs is a filesystem-based manager |
| 8 | of kernel objects, or config_items. | 8 | of kernel objects, or config_items. |
diff --git a/fs/dlm/Kconfig b/fs/dlm/Kconfig index 2dbb422e8116..1897eb1b4b6a 100644 --- a/fs/dlm/Kconfig +++ b/fs/dlm/Kconfig | |||
| @@ -1,8 +1,7 @@ | |||
| 1 | menuconfig DLM | 1 | menuconfig DLM |
| 2 | tristate "Distributed Lock Manager (DLM)" | 2 | tristate "Distributed Lock Manager (DLM)" |
| 3 | depends on EXPERIMENTAL && INET | 3 | depends on EXPERIMENTAL && INET |
| 4 | depends on SYSFS && (IPV6 || IPV6=n) | 4 | depends on SYSFS && CONFIGFS_FS && (IPV6 || IPV6=n) |
| 5 | select CONFIGFS_FS | ||
| 6 | select IP_SCTP | 5 | select IP_SCTP |
| 7 | help | 6 | help |
| 8 | A general purpose distributed lock manager for kernel or userspace | 7 | A general purpose distributed lock manager for kernel or userspace |
diff --git a/fs/ocfs2/Kconfig b/fs/ocfs2/Kconfig index ab152c00cd3a..77a8de5f7119 100644 --- a/fs/ocfs2/Kconfig +++ b/fs/ocfs2/Kconfig | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | config OCFS2_FS | 1 | config OCFS2_FS |
| 2 | tristate "OCFS2 file system support" | 2 | tristate "OCFS2 file system support" |
| 3 | depends on NET && SYSFS | 3 | depends on NET && SYSFS && CONFIGFS_FS |
| 4 | select CONFIGFS_FS | ||
| 5 | select JBD2 | 4 | select JBD2 |
| 6 | select CRC32 | 5 | select CRC32 |
| 7 | select QUOTA | 6 | select QUOTA |