ata: ahci_brcmstb: rename to support across Broadcom SoC's

[sfrench/cifs-2.6.git] / drivers / ata / Kconfig

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index cfa936a32513b1d70d74834fa743b6f612665dc1..8fe06e6a9a0b9a72c7e67b6e47bb3237931f6072 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -98,12 +98,12 @@ config SATA_AHCI_PLATFORM
 
          If unsure, say N.
 
-config AHCI_BRCMSTB
-       tristate "Broadcom STB AHCI SATA support"
+config AHCI_BRCM
+       tristate "Broadcom AHCI SATA support"
        depends on ARCH_BRCMSTB || BMIPS_GENERIC
        help
          This option enables support for the AHCI SATA3 controller found on
-         STB SoC's.
+         Broadcom SoC's.
 
          If unsure, say N.
 
@@ -313,14 +313,23 @@ config ATA_PIIX
 
 config SATA_DWC
        tristate "DesignWare Cores SATA support"
-       depends on 460EX
-       select DW_DMAC
+       depends on DMADEVICES
+       select GENERIC_PHY
        help
          This option enables support for the on-chip SATA controller of the
          AppliedMicro processor 460EX.
 
          If unsure, say N.
 
+config SATA_DWC_OLD_DMA
+       bool "Support old device trees"
+       depends on SATA_DWC
+       select DW_DMAC_CORE
+       default y if 460EX
+       help
+         This option enables support for old device trees without the
+         "dmas" property.
+
 config SATA_DWC_DEBUG
        bool "Debugging driver version"
        depends on SATA_DWC