]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'slave-dma/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 02:09:13 +0000 (13:09 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 02:09:13 +0000 (13:09 +1100)
Conflicts:
drivers/dma/ioat/dma_v3.c
drivers/dma/tegra20-apb-dma.c

20 files changed:
1  2 
arch/arm/boot/dts/exynos5250.dtsi
drivers/dma/Kconfig
drivers/dma/Makefile
drivers/dma/dw_dmac.c
drivers/dma/edma.c
drivers/dma/ioat/dma.c
drivers/dma/ioat/dma.h
drivers/dma/ioat/dma_v2.c
drivers/dma/ioat/dma_v3.c
drivers/dma/ioat/pci.c
drivers/dma/iop-adma.c
drivers/dma/mmp_pdma.c
drivers/dma/mv_xor.c
drivers/dma/pch_dma.c
drivers/dma/pl330.c
drivers/dma/sh/shdma.c
drivers/dma/sirf-dma.c
drivers/dma/tegra20-apb-dma.c
drivers/mtd/nand/fsmc_nand.c
net/ipv4/tcp.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 3e9d66920eb3491d85b8c6027ac786a76242e107,2acd1ad57fd6f587a3edfbc45a20bef5fbd5f0d6..e8336cce360b8f03a504890dc5ee426a2179f3ff
@@@ -1187,7 -1239,27 +1239,27 @@@ static bool is_snb_ioat(struct pci_dev 
        }
  }
  
 -int __devinit ioat3_dma_probe(struct ioatdma_device *device, int dca)
+ 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 ioat3_dma_probe(struct ioatdma_device *device, int dca)
  {
        struct pci_dev *pdev = device->pdev;
        int dca_en = system_has_dca_enabled(pdev);
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/tcp.c
Simple merge