diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-16 18:06:43 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-16 18:06:43 -0500 |
| commit | 8a335bc631ac9c43675821580c26ebf95a3044ba (patch) | |
| tree | e02cf3c2394fe4e07d8e786ff9ba049005b1e928 /drivers | |
| parent | 115374211961a503675730603e3d48d95d41736c (diff) | |
| parent | 7b1fff7e4fdf2805fce7afd6247912588d72d604 (diff) | |
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 'drivers')
| -rw-r--r-- | drivers/net/Kconfig | 3 |
1 files changed, 1 insertions, 2 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) |