Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

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

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index c2328aed08361c0e8a8caf97666935f17c953a0c..75afa75a515e03c17a44a97cc711c7ad803e4aa2 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -202,6 +202,18 @@ config SATA_DWC
 
          If unsure, say N.
 
+config SATA_DWC_DEBUG
+       bool "Debugging driver version"
+       depends on SATA_DWC
+       help
+         This option enables debugging output in the driver.
+
+config SATA_DWC_VDEBUG
+       bool "Verbose debug output"
+       depends on SATA_DWC_DEBUG
+       help
+         This option enables the taskfile dumping and NCQ debugging.
+
 config SATA_MV
        tristate "Marvell SATA support"
        help
@@ -299,6 +311,12 @@ config PATA_AMD
 
          If unsure, say N.
 
+config PATA_ARASAN_CF
+       tristate "ARASAN CompactFlash PATA Controller Support"
+       select DMA_ENGINE
+       help
+         Say Y here to support the ARASAN CompactFlash PATA controller
+
 config PATA_ARTOP
        tristate "ARTOP 6210/6260 PATA support"
        depends on PCI