Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[uclinux-h8/linux.git] / drivers / ata / Kconfig

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index a3a1360..6d17a3b 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
@@ -270,6 +288,7 @@ config ATA_PIIX
 config SATA_DWC
        tristate "DesignWare Cores SATA support"
        depends on 460EX
+       select DW_DMAC
        help
          This option enables support for the on-chip SATA controller of the
          AppliedMicro processor 460EX.
@@ -729,15 +748,6 @@ config PATA_SC1200
 
          If unsure, say N.
 
-config PATA_SCC
-       tristate "Toshiba's Cell Reference Set IDE support"
-       depends on PCI && PPC_CELLEB
-       help
-         This option enables support for the built-in IDE controller on
-         Toshiba Cell Reference Board.
-
-         If unsure, say N.
-
 config PATA_SCH
        tristate "Intel SCH PATA support"
        depends on PCI