diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 20:44:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 20:44:34 -0400 |
| commit | 04fc5fd39e09c460fd478ea84b34c445dd376759 (patch) | |
| tree | 320731ed5046fc33f77ad957bb3fd7b5eaa4b5fe /drivers/ata/Kconfig | |
| parent | 8aee74c8ee875448cc6d1cf995c9469eb60ae515 (diff) | |
| parent | 8bc3fc470eb25af4d70c72485cbcb130cc657691 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: bump versions
libata: Trim trailing whitespace
libata: Kiss post_set_mode goodbye
ata_piix: clean up
pata_hpt366: Enable bits are unreliable so don't use them
libata: Add Seagate STT20000A to DMA blacklist.
ahci: disable 64bit dma on sb600
Diffstat (limited to 'drivers/ata/Kconfig')
| -rw-r--r-- | drivers/ata/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index ad1f59c1b3fc..b4a8d6030e48 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
| @@ -132,7 +132,7 @@ config SATA_SIS | |||
| 132 | depends on PCI | 132 | depends on PCI |
| 133 | select PATA_SIS | 133 | select PATA_SIS |
| 134 | help | 134 | help |
| 135 | This option enables support for SiS Serial ATA on | 135 | This option enables support for SiS Serial ATA on |
| 136 | SiS 964/965/966/180 and Parallel ATA on SiS 180. | 136 | SiS 964/965/966/180 and Parallel ATA on SiS 180. |
| 137 | The PATA support for SiS 180 requires additionally to | 137 | The PATA support for SiS 180 requires additionally to |
| 138 | enable the PATA_SIS driver in the config. | 138 | enable the PATA_SIS driver in the config. |