diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 18:17:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 18:17:52 -0400 |
| commit | 0b019a41553a919965bb02d07d54e3e6c57a796d (patch) | |
| tree | 6e329b4159b440d2aac5200a5c07103fe261c096 /drivers/ata/Kconfig | |
| parent | 5f6878b0d22f9b93f9698f88c335007e2a3c3bbc (diff) | |
| parent | 054d5c9238f3c577ad51195c3ee7803613f322cc (diff) | |
Merge branches 'master' and 'devel' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
Diffstat (limited to 'drivers/ata/Kconfig')
| -rw-r--r-- | drivers/ata/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 8fae6afd6a3d..65e3e2708371 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
| @@ -651,6 +651,17 @@ config PATA_VIA | |||
| 651 | 651 | ||
| 652 | If unsure, say N. | 652 | If unsure, say N. |
| 653 | 653 | ||
| 654 | config PATA_PXA | ||
| 655 | tristate "PXA DMA-capable PATA support" | ||
| 656 | depends on ARCH_PXA | ||
| 657 | help | ||
| 658 | This option enables support for harddrive attached to PXA CPU's bus. | ||
| 659 | |||
| 660 | NOTE: This driver utilizes PXA DMA controller, in case your hardware | ||
| 661 | is not capable of doing MWDMA, use pata_platform instead. | ||
| 662 | |||
| 663 | If unsure, say N. | ||
| 664 | |||
| 654 | config PATA_WINBOND | 665 | config PATA_WINBOND |
| 655 | tristate "Winbond SL82C105 PATA support" | 666 | tristate "Winbond SL82C105 PATA support" |
| 656 | depends on PCI | 667 | depends on PCI |