diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-16 15:06:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-16 15:06:43 -0800 |
| commit | 8a335bc631ac9c43675821580c26ebf95a3044ba (patch) | |
| tree | e02cf3c2394fe4e07d8e786ff9ba049005b1e928 /fs | |
| parent | 115374211961a503675730603e3d48d95d41736c (diff) | |
| parent | 7b1fff7e4fdf2805fce7afd6247912588d72d604 (diff) | |
| download | linux-8a335bc631ac9c43675821580c26ebf95a3044ba.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/scsi-post-merge-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/scsi-post-merge-2.6:
ocfs2: Make OCFS2_FS depend on CONFIGFS_FS
dlm: Make DLM depend on CONFIGFS_FS
net: Make NETCONSOLE_DYNAMIC depend on CONFIGFS_FS
configfs: change depends -> select SYSFS
[SCSI] sd,sr: kill compat SDEV_MEDIA_CHANGE event
[SCSI] sd: implement sd_check_events()
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/configfs/Kconfig | 4 | ||||
| -rw-r--r-- | fs/dlm/Kconfig | 3 | ||||
| -rw-r--r-- | fs/ocfs2/Kconfig | 3 |
3 files changed, 4 insertions, 6 deletions
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 @@ config CONFIGFS_FS tristate "Userspace-driven configuration filesystem" - depends on SYSFS + select SYSFS help - configfs is a ram-based filesystem that provides the converse + configfs is a RAM-based filesystem that provides the converse of sysfs's functionality. Where sysfs is a filesystem-based view of kernel objects, configfs is a filesystem-based manager 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 @@ menuconfig DLM tristate "Distributed Lock Manager (DLM)" depends on EXPERIMENTAL && INET - depends on SYSFS && (IPV6 || IPV6=n) - select CONFIGFS_FS + depends on SYSFS && CONFIGFS_FS && (IPV6 || IPV6=n) select IP_SCTP help 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 @@ config OCFS2_FS tristate "OCFS2 file system support" - depends on NET && SYSFS - select CONFIGFS_FS + depends on NET && SYSFS && CONFIGFS_FS select JBD2 select CRC32 select QUOTA |