Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / drivers / ata / Kconfig

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 38318aaf29d35da97088d3886985195aee13d938..70b57d2229d6657c57c054fa9272484bdc397ca1 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -14,7 +14,7 @@ menuconfig ATA
        tristate "Serial ATA and Parallel ATA drivers (libata)"
        depends on HAS_IOMEM
        depends on BLOCK
-       depends on !(M32R || M68K || S390) || BROKEN
+       depends on !(M32R || S390) || BROKEN
        select SCSI
        select GLOB
        ---help---
@@ -129,6 +129,7 @@ config AHCI_ST
 config AHCI_IMX
        tristate "Freescale i.MX AHCI SATA support"
        depends on MFD_SYSCON && (ARCH_MXC || COMPILE_TEST)
+       depends on (HWMON && (THERMAL || !THERMAL_OF)) || !HWMON
        help
          This option enables support for the Freescale i.MX SoC's
          onboard AHCI SATA.
@@ -902,6 +903,15 @@ config PATA_CMD640_PCI
 
          If unsure, say N.
 
+config PATA_FALCON
+       tristate "Atari Falcon PATA support"
+       depends on M68K && ATARI
+       help
+         This option enables support for the on-board IDE
+         interface on the Atari Falcon.
+
+         If unsure, say N.
+
 config PATA_ISAPNP
        tristate "ISA Plug and Play PATA support"
        depends on ISAPNP