diff --git a/[refs] b/[refs] index b55d4f709a19..5d077fbfc8a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 201ce85946504ea0e6bd9a365de26684b437121e +refs/heads/master: 2154cfa6ba560401d25f6cc083fe3fb996cbb571 diff --git a/trunk/drivers/scsi/Kconfig b/trunk/drivers/scsi/Kconfig index c84b02aec1f3..96a81cd17617 100644 --- a/trunk/drivers/scsi/Kconfig +++ b/trunk/drivers/scsi/Kconfig @@ -501,7 +501,7 @@ config SCSI_ATA_PIIX tristate "Intel PIIX/ICH SATA support" depends on SCSI_SATA && PCI help - This option enables support for ICH5 Serial ATA. + This option enables support for ICH5/6/7/8 Serial ATA. If PATA support was enabled previously, this enables support for select Intel PIIX/ICH PATA host controllers.