diff options
| author | Tejun Heo <tj@kernel.org> | 2015-02-09 13:54:41 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2015-02-09 13:54:41 +0100 |
| commit | b12aa1f25e1da7e23fa44f646ac46e41366cfc6c (patch) | |
| tree | 465be1cfceaa37861f5629821e1be2559ba39cfb /drivers/ata/Kconfig | |
| parent | ata: libahci: Use of_platform_device_create only if supported (diff) | |
| parent | ahci_xgene: Fix the dma state machine lockup for the ATA_CMD_SMART PIO mode c... (diff) | |
| download | linux-b12aa1f25e1da7e23fa44f646ac46e41366cfc6c.tar.xz linux-b12aa1f25e1da7e23fa44f646ac46e41366cfc6c.zip | |
Merge branch 'for-3.19-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata into for-3.20
09c32aaa3683 ("ahci_xgene: Fix the dma state machine lockup for the
ATA_CMD_SMART PIO mode command.") missed 3.19 release. Fold it into
for-3.20.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata/Kconfig')
| -rw-r--r-- | drivers/ata/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 9f2ba27388b6..e7f338a3a3c2 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -835,6 +835,7 @@ config PATA_AT32 config PATA_AT91 tristate "PATA support for AT91SAM9260" depends on ARM && SOC_AT91SAM9 + depends on !ARCH_MULTIPLATFORM help This option enables support for IDE devices on the Atmel AT91SAM9260 SoC. |