diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 17:04:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-21 17:04:03 -0400 |
| commit | 81d1c3a52cd78fdbb9f0d80214fc9e7d49bf22c0 (patch) | |
| tree | a9c33aaf393c64f6f31eacb6c24007ce99467aab /drivers | |
| parent | 5fe8321b8886d814e65952d74b207fe59e1096ea (diff) | |
| parent | 3e0f686e6bf347eea4a41d7d415f003c2f42b1a0 (diff) | |
Merge branch 'stable/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6
* 'stable/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6:
ibft: fix kconfig dependencies
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/firmware/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 280c9b5ad9e3..88a3ae6cd023 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig | |||
| @@ -125,7 +125,7 @@ config ISCSI_IBFT_FIND | |||
| 125 | config ISCSI_IBFT | 125 | config ISCSI_IBFT |
| 126 | tristate "iSCSI Boot Firmware Table Attributes module" | 126 | tristate "iSCSI Boot Firmware Table Attributes module" |
| 127 | select ISCSI_BOOT_SYSFS | 127 | select ISCSI_BOOT_SYSFS |
| 128 | depends on ISCSI_IBFT_FIND && SCSI | 128 | depends on ISCSI_IBFT_FIND && SCSI && SCSI_LOWLEVEL |
| 129 | default n | 129 | default n |
| 130 | help | 130 | help |
| 131 | This option enables support for detection and exposing of iSCSI | 131 | This option enables support for detection and exposing of iSCSI |