aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/Kconfig
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-09-16 17:11:43 -0400
committerDavid S. Miller <davem@davemloft.net>2008-09-16 17:11:43 -0400
commit2e57572a50a4de41c6cbc879a4866a312d4cd316 (patch)
treec4f58ec96c06642c4b415b881d3f0a3b673d5b44 /drivers/ata/Kconfig
parent9b2e43ae4e9609f80034dfe8de895045cac52d77 (diff)
parentf948cc6ab9e61a8e88d70ee9aafc690e6d26f92c (diff)
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/Kconfig6
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
447 tristate "Marvell PATA support via legacy mode" 447 tristate "Marvell PATA support via legacy mode"
448 depends on PCI 448 depends on PCI
449 help 449 help
450 This option enables limited support for the Marvell 88SE6145 ATA 450 This option enables limited support for the Marvell 88SE61xx ATA
451 controller. 451 controllers. If you wish to use only the SATA ports then select
452 the AHCI driver alone. If you wish to the use the PATA port or
453 both SATA and PATA include this driver.
452 454
453 If unsure, say N. 455 If unsure, say N.
454 456