From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Feb 2013 02:09:13 +0000 (+1100)
Subject: Merge remote-tracking branch 'slave-dma/next'
X-Git-Tag: next-20130220~70
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fcc251bd737ca4cceca97b5eb3d12b5dfdf4515d;p=karo-tx-linux.git

Merge remote-tracking branch 'slave-dma/next'

Conflicts:
	drivers/dma/ioat/dma_v3.c
	drivers/dma/tegra20-apb-dma.c
---

fcc251bd737ca4cceca97b5eb3d12b5dfdf4515d
diff --cc drivers/dma/ioat/dma_v3.c
index 3e9d66920eb3,2acd1ad57fd6..e8336cce360b
--- a/drivers/dma/ioat/dma_v3.c
+++ b/drivers/dma/ioat/dma_v3.c
@@@ -1187,7 -1239,27 +1239,27 @@@ static bool is_snb_ioat(struct pci_dev 
  	}
  }
  
+ static bool is_ivb_ioat(struct pci_dev *pdev)
+ {
+ 	switch (pdev->device) {
+ 	case PCI_DEVICE_ID_INTEL_IOAT_IVB0:
+ 	case PCI_DEVICE_ID_INTEL_IOAT_IVB1:
+ 	case PCI_DEVICE_ID_INTEL_IOAT_IVB2:
+ 	case PCI_DEVICE_ID_INTEL_IOAT_IVB3:
+ 	case PCI_DEVICE_ID_INTEL_IOAT_IVB4:
+ 	case PCI_DEVICE_ID_INTEL_IOAT_IVB5:
+ 	case PCI_DEVICE_ID_INTEL_IOAT_IVB6:
+ 	case PCI_DEVICE_ID_INTEL_IOAT_IVB7:
+ 	case PCI_DEVICE_ID_INTEL_IOAT_IVB8:
+ 	case PCI_DEVICE_ID_INTEL_IOAT_IVB9:
+ 		return true;
+ 	default:
+ 		return false;
+ 	}
+ 
+ }
+ 
 -int __devinit ioat3_dma_probe(struct ioatdma_device *device, int dca)
 +int ioat3_dma_probe(struct ioatdma_device *device, int dca)
  {
  	struct pci_dev *pdev = device->pdev;
  	int dca_en = system_has_dca_enabled(pdev);