diff options
author | Chris Zankel <chris@zankel.net> | 2014-11-10 09:05:43 +0100 |
---|---|---|
committer | Chris Zankel <chris@zankel.net> | 2014-11-10 09:05:43 +0100 |
commit | aeb589734251aaf4c28d80d0efb5da01dc0ce868 (patch) | |
tree | ea1ee0a54d4c24221a1e80cd07e899f8b34a6920 /drivers/acpi/acpi_platform.c | |
parent | Merge tag 'xtensa-for-next-20141021-1' of git://github.com/jcmvbkbc/linux-xte... (diff) | |
parent | Linux 3.18-rc4 (diff) | |
download | linux-aeb589734251aaf4c28d80d0efb5da01dc0ce868.tar.xz linux-aeb589734251aaf4c28d80d0efb5da01dc0ce868.zip |
Merge tag 'v3.18-rc4' into for_next
Linux 3.18-rc4
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); |