diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-16 23:11:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-16 23:11:43 +0200 |
| commit | 2e57572a50a4de41c6cbc879a4866a312d4cd316 (patch) | |
| tree | c4f58ec96c06642c4b415b881d3f0a3b673d5b44 /drivers/ata/Kconfig | |
| parent | sparc32: Use PROM device probing for sun4m timer registers. (diff) | |
| parent | sparc64: Fix OOPS in psycho_pcierr_intr_other(). (diff) | |
| download | linux-2e57572a50a4de41c6cbc879a4866a312d4cd316.tar.xz linux-2e57572a50a4de41c6cbc879a4866a312d4cd316.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts:
arch/sparc64/kernel/pci_psycho.c
Diffstat (limited to 'drivers/ata/Kconfig')
| -rw-r--r-- | drivers/ata/Kconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 55d7ee4e92b4..3b54e6e60635 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -447,8 +447,10 @@ config PATA_MARVELL tristate "Marvell PATA support via legacy mode" depends on PCI help - This option enables limited support for the Marvell 88SE6145 ATA - controller. + This option enables limited support for the Marvell 88SE61xx ATA + controllers. If you wish to use only the SATA ports then select + the AHCI driver alone. If you wish to the use the PATA port or + both SATA and PATA include this driver. If unsure, say N. |