diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-08-16 20:10:56 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-08-16 20:10:56 +0200 |
commit | 13fe7056bebb4015c6231a07a1be4d3aebbfe979 (patch) | |
tree | 8aefa59a61c081c402bc85f2b47c17e1374eabdd /arch/alpha/kernel/pci_iommu.c | |
parent | MAINTAINERS: Add PhoenixRC Flight Controller Adapter (diff) | |
parent | Input: do not use WARN() in input_alloc_absinfo() (diff) | |
download | linux-13fe7056bebb4015c6231a07a1be4d3aebbfe979.tar.xz linux-13fe7056bebb4015c6231a07a1be4d3aebbfe979.zip |
Merge branch 'next' into for-linus
Prepare input updates for 4.19 merge window.
Diffstat (limited to 'arch/alpha/kernel/pci_iommu.c')
-rw-r--r-- | arch/alpha/kernel/pci_iommu.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c index 83b34b9188ea..6923b0d9c1e1 100644 --- a/arch/alpha/kernel/pci_iommu.c +++ b/arch/alpha/kernel/pci_iommu.c @@ -950,6 +950,4 @@ const struct dma_map_ops alpha_pci_ops = { .mapping_error = alpha_pci_mapping_error, .dma_supported = alpha_pci_supported, }; - -const struct dma_map_ops *dma_ops = &alpha_pci_ops; -EXPORT_SYMBOL(dma_ops); +EXPORT_SYMBOL(alpha_pci_ops); |