diff --git a/[refs] b/[refs] index 4a5d0422b982..497517e7d674 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d3c30efc964fadf2e6270e6fceaeca3ce50027a +refs/heads/master: f9228c7ffaaa37521c46239ccea623f10fa44a27 diff --git a/trunk/drivers/ata/Kconfig b/trunk/drivers/ata/Kconfig index 503a908afc80..0bcf26464670 100644 --- a/trunk/drivers/ata/Kconfig +++ b/trunk/drivers/ata/Kconfig @@ -112,11 +112,11 @@ config ATA_PIIX If unsure, say N. config SATA_MV - tristate "Marvell SATA support (HIGHLY EXPERIMENTAL)" - depends on EXPERIMENTAL + tristate "Marvell SATA support" help This option enables support for the Marvell Serial ATA family. - Currently supports 88SX[56]0[48][01] chips. + Currently supports 88SX[56]0[48][01] PCI(-X) chips, + as well as the newer [67]042 PCI-X/PCIe and SOC devices. If unsure, say N.