Merge branch 'dmaengine' into async-tx-next

Conflicts:
	crypto/async_tx/async_xor.c
	drivers/dma/ioat/dma_v2.h
	drivers/dma/ioat/pci.c
	drivers/md/raid5.c

1 files changed, 20 insertions, 0 deletions

diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index 65be27995d5c..2f15cc17d887 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -284,6 +284,18 @@ static const struct sdhci_pci_fixes sdhci_jmicron = {
         .resume         = jmicron_resume,
 };
 
+static int via_probe(struct sdhci_pci_chip *chip)
+{
+        if (chip->pdev->revision == 0x10)
+                chip->quirks |= SDHCI_QUIRK_DELAY_AFTER_POWER;
+
+        return 0;
+}
+
+static const struct sdhci_pci_fixes sdhci_via = {
+        .probe          = via_probe,
+};
+
 static const struct pci_device_id pci_ids[] __devinitdata = {
         {
                 .vendor         = PCI_VENDOR_ID_RICOH,
@@ -349,6 +361,14 @@ static const struct pci_device_id pci_ids[] __devinitdata = {
                 .driver_data    = (kernel_ulong_t)&sdhci_jmicron,
         },
 
+        {
+                .vendor         = PCI_VENDOR_ID_VIA,
+                .device         = 0x95d0,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = PCI_ANY_ID,
+                .driver_data    = (kernel_ulong_t)&sdhci_via,
+        },
+
         {       /* Generic SD host controller */
                 PCI_DEVICE_CLASS((PCI_CLASS_SYSTEM_SDHCI << 8), 0xFFFF00)
         },