Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (29 commits)
  ahci: add another PCI ID for marvell
  libata: Use 'bool' return value for ata_id_XXX
  sata_fsl: Update RX_WATER_MARK for TRANSCFG
  sata_fsl: Fix wrong Device Error Register usage
  libata: Include WWN ID in inquiry VPD emulation
  ata/pata_arasan_cf: fill dma chan->private from pdata->dma_priv
  ata: pata: Convert pr_*(DRV_NAME ...) to pr_fmt/pr_<level>
  pata_arasan_cf: fix printk format string warning
  pata_arasan_cf: Adding support for arasan compact flash host controller
  libata-sff: add ata_sff_queue_work() & ata_sff_queue_delayed_work()
  ahci: AHCI mode SATA patch for Intel Patsburg SATA RAID controller
  ahci: recognize Marvell 88se9125 PCIe SATA 6.0 Gb/s controller
  libata: remove ATA_FLAG_LPM
  libata: remove ATA_FLAG_NO_LEGACY
  libata: remove ATA_FLAG_MMIO
  libata: remove ATA_FLAG_{SRST|SATA_RESET}
  ipr/sas_ata: use mode mask macros from <linux/ata.h>
  sata_dwc_460ex: add debugging options
  sata_dwc_460ex: fix misuse of ata_get_cmd_descript()
  sata_dwc_460ex: fix return value of dma_dwc_xfer_setup()
  ...

1 files changed, 18 insertions, 0 deletions

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index c2328aed0836..75afa75a515e 100644
--- 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