diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-25 17:44:18 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-25 17:44:18 -0400 |
| commit | 54f53f2b94feb72622bec7a8563fc487d9f97720 (patch) | |
| tree | ab0c4e1dcadd25a00fa7a4febf41bc43b864cf73 /drivers/scsi/Kconfig | |
| parent | f61fb8a52cdf8b9b6a6badde84aefe58cb35d315 (diff) | |
| parent | a4083c9271e0a697278e089f2c0b9a95363ada0a (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/scsi/Kconfig')
| -rw-r--r-- | drivers/scsi/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index c46666a24809..b9d374082b65 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
| @@ -325,7 +325,7 @@ menuconfig SCSI_LOWLEVEL | |||
| 325 | depends on SCSI!=n | 325 | depends on SCSI!=n |
| 326 | default y | 326 | default y |
| 327 | 327 | ||
| 328 | if SCSI_LOWLEVEL | 328 | if SCSI_LOWLEVEL && SCSI |
| 329 | 329 | ||
| 330 | config ISCSI_TCP | 330 | config ISCSI_TCP |
| 331 | tristate "iSCSI Initiator over TCP/IP" | 331 | tristate "iSCSI Initiator over TCP/IP" |