Merge git://www.linux-watchdog.org/linux-watchdog

[firefly-linux-kernel-4.4.55.git] / drivers / ata / Kconfig

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index c2706047337f17c0fad38b3161cabc93d95be0e5..7671dbac6015e57c1577f24a89ad47c760318b81 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -123,6 +123,15 @@ config AHCI_IMX
 
          If unsure, say N.
 
+config AHCI_MVEBU
+       tristate "Marvell EBU AHCI SATA support"
+       depends on ARCH_MVEBU
+       help
+         This option enables support for the Marvebu EBU SoC's
+         onboard AHCI SATA.
+
+         If unsure, say N.
+
 config AHCI_SUNXI
        tristate "Allwinner sunxi AHCI SATA support"
        depends on ARCH_SUNXI
@@ -815,7 +824,7 @@ config PATA_AT32
 
 config PATA_AT91
        tristate "PATA support for AT91SAM9260"
-       depends on ARM && ARCH_AT91
+       depends on ARM && SOC_AT91SAM9
        help
          This option enables support for IDE devices on the Atmel AT91SAM9260 SoC.