diff --git a/[refs] b/[refs] index 74df16c79f1f..f1af7e2a5d92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe334602a83463aff59ae24c4b3e808d650a3c80 +refs/heads/master: 2c7620d50c23737728bccfb26ffb94cd51e58007 diff --git a/trunk/drivers/ata/Kconfig b/trunk/drivers/ata/Kconfig index 9e101aa638d1..3747457fee7a 100644 --- a/trunk/drivers/ata/Kconfig +++ b/trunk/drivers/ata/Kconfig @@ -41,12 +41,12 @@ config SATA_SVW If unsure, say N. config ATA_PIIX - tristate "Intel PIIX/ICH SATA support" + tristate "Intel ESB, ICH, PIIX3, PIIX4 PATA/SATA support" depends on PCI help This option enables support for ICH5/6/7/8 Serial ATA - and support for PATA on the Intel PIIX3/PIIX4/ICH series - PATA host controllers. + and support for PATA on the Intel ESB/ICH/PIIX3/PIIX4 series + host controllers. If unsure, say N.