diff options
| author |   Thierry Reding <treding@nvidia.com> | 2014-11-26 09:41:09 +0100 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2014-11-26 09:42:11 +0100 |
| commit | 7f06dd61248a75668bbb39b6fcca6ff407745df8 (patch) | |
| tree | 30cefbd6f503d20557e24a1765a027687170a7da /drivers/acpi/acpi_platform.c | |
| parent | Linux 3.18-rc1 (diff) | |
| parent | powerpc/iommu: Rename iommu_[un]map_sg functions (diff) | |
| download | linux-dev-7f06dd61248a75668bbb39b6fcca6ff407745df8.tar.xz linux-dev-7f06dd61248a75668bbb39b6fcca6ff407745df8.zip | |
Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
This branch contains a couple of changes that will conflict with the
Tegra SMMU driver rewrite. Since the driver is largely rewritten the
conflict resolution is non-trivial.
Diffstat (limited to 'drivers/acpi/acpi_platform.c')
| -rw-r--r-- | drivers/acpi/acpi_platform.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c index 2bf9082f7523..6ba8beb6b9d2 100644 --- a/drivers/acpi/acpi_platform.c +++ b/drivers/acpi/acpi_platform.c @@ -16,6 +16,7 @@ #include <linux/err.h> #include <linux/kernel.h> #include <linux/module.h> +#include <linux/dma-mapping.h> #include <linux/platform_device.h> #include "internal.h" @@ -102,6 +103,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev) pdevinfo.res = resources; pdevinfo.num_res = count; pdevinfo.acpi_node.companion = adev; + pdevinfo.dma_mask = DMA_BIT_MASK(32); pdev = platform_device_register_full(&pdevinfo); if (IS_ERR(pdev)) dev_err(&adev->dev, "platform device creation failed: %ld\n", @@ -113,3 +115,4 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev) kfree(resources); return pdev; } +EXPORT_SYMBOL_GPL(acpi_create_platform_device); |