Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

[karo-tx-linux.git] / drivers / ata / Kconfig

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 9dca4b995be0792b6c4f1920b9786cb6517a2b5f..b11470a7bd8f870912b44fce0bdff1eba8ebd7c7 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -98,6 +98,15 @@ config SATA_AHCI_PLATFORM
 
          If unsure, say N.
 
+config AHCI_BRCMSTB
+       tristate "Broadcom STB AHCI SATA support"
+       depends on ARCH_BRCMSTB
+       help
+         This option enables support for the AHCI SATA3 controller found on
+         STB SoC's.
+
+         If unsure, say N.
+
 config AHCI_DA850
        tristate "DaVinci DA850 AHCI SATA support"
        depends on ARCH_DAVINCI_DA850
@@ -124,6 +133,15 @@ config AHCI_IMX
 
          If unsure, say N.
 
+config AHCI_CEVA
+       tristate "CEVA AHCI SATA support"
+       depends on OF
+       help
+         This option enables support for the CEVA AHCI SATA.
+         It can be found on the Xilinx Zynq UltraScale+ MPSoC.
+
+         If unsure, say N.
+
 config AHCI_MVEBU
        tristate "Marvell EBU AHCI SATA support"
        depends on ARCH_MVEBU