Merge tag 'please-pull-einj-mmcfg' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index e1b92788c225875efb978f21f8cd25f817f68a52..a3a13605a9c42d13baed5746f9f1bfb9bc30536c 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -61,7 +61,7 @@ config ATA_ACPI
 
 config SATA_ZPODD
        bool "SATA Zero Power Optical Disc Drive (ZPODD) support"
-       depends on ATA_ACPI && PM_RUNTIME
+       depends on ATA_ACPI && PM
        default n
        help
          This option adds support for SATA Zero Power Optical Disc
@@ -299,7 +299,7 @@ config SATA_HIGHBANK
 
 config SATA_MV
        tristate "Marvell SATA support"
-       depends on PCI || ARCH_DOVE || ARCH_KIRKWOOD || ARCH_MV78XX0 || \
+       depends on PCI || ARCH_DOVE || ARCH_MV78XX0 || \
                   ARCH_MVEBU || ARCH_ORION5X || COMPILE_TEST
        select GENERIC_PHY
        help