diff options
| author | Joerg Roedel <jroedel@suse.de> | 2016-11-30 15:35:31 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2016-11-30 15:35:31 +0100 |
| commit | ac1d35659bcd9d4c3189828dbce4dd4fcf3e8c40 (patch) | |
| tree | 7b626e7709336b5960add13281e966e16af72c66 /drivers/pci/probe.c | |
| parent | e5517c2a5a49ed5e99047008629f1cd60246ea0e (diff) | |
| parent | 643b8e4d86f8b1a62cf5cd9ea221e9bc0d531d18 (diff) | |
| download | op-kernel-dev-ac1d35659bcd9d4c3189828dbce4dd4fcf3e8c40.zip op-kernel-dev-ac1d35659bcd9d4c3189828dbce4dd4fcf3e8c40.tar.gz | |
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Diffstat (limited to 'drivers/pci/probe.c')
| -rw-r--r-- | drivers/pci/probe.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index ab00267..c29e07a 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1738,8 +1738,7 @@ static void pci_dma_configure(struct pci_dev *dev) if (attr == DEV_DMA_NOT_SUPPORTED) dev_warn(&dev->dev, "DMA not supported.\n"); else - arch_setup_dma_ops(&dev->dev, 0, 0, NULL, - attr == DEV_DMA_COHERENT); + acpi_dma_configure(&dev->dev, attr); } pci_put_host_bridge_device(bridge); |
