diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
| commit | 30716e07ef511ec7525c07eb1e8060ba8943c2a2 (patch) | |
| tree | eb6a47cae63d3587fa773cc5a16781eaa2c7810b /drivers/scsi/Kconfig | |
| parent | 03c79cc56e4497cbd09d74a73c1bd0d1d9a8a16c (diff) | |
| parent | f56df2f4db6e4af87fb8e941cff69f4501a111df (diff) | |
Merge branch 'linus'
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 0133f3a6977d..5bf3f07870ba 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
| @@ -1312,7 +1312,7 @@ config SCSI_LPFC | |||
| 1312 | 1312 | ||
| 1313 | config SCSI_SEAGATE | 1313 | config SCSI_SEAGATE |
| 1314 | tristate "Seagate ST-02 and Future Domain TMC-8xx SCSI support" | 1314 | tristate "Seagate ST-02 and Future Domain TMC-8xx SCSI support" |
| 1315 | depends on X86 && ISA && SCSI && BROKEN | 1315 | depends on X86 && ISA && SCSI |
| 1316 | ---help--- | 1316 | ---help--- |
| 1317 | These are 8-bit SCSI controllers; the ST-01 is also supported by | 1317 | These are 8-bit SCSI controllers; the ST-01 is also supported by |
| 1318 | this driver. It is explained in section 3.9 of the SCSI-HOWTO, | 1318 | this driver. It is explained in section 3.9 of the SCSI-HOWTO, |