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 /include/acpi | |
| parent | e5517c2a5a49ed5e99047008629f1cd60246ea0e (diff) | |
| parent | 643b8e4d86f8b1a62cf5cd9ea221e9bc0d531d18 (diff) | |
| download | linux-ac1d35659bcd9d4c3189828dbce4dd4fcf3e8c40.tar.gz linux-ac1d35659bcd9d4c3189828dbce4dd4fcf3e8c40.tar.bz2 linux-ac1d35659bcd9d4c3189828dbce4dd4fcf3e8c40.zip | |
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 'include/acpi')
| -rw-r--r-- | include/acpi/acpi_bus.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index c1a524de67c5..4242c31ffaee 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -573,6 +573,8 @@ struct acpi_pci_root { bool acpi_dma_supported(struct acpi_device *adev); enum dev_dma_attr acpi_get_dma_attr(struct acpi_device *adev); +void acpi_dma_configure(struct device *dev, enum dev_dma_attr attr); +void acpi_dma_deconfigure(struct device *dev); struct acpi_device *acpi_find_child_device(struct acpi_device *parent, u64 address, bool check_children); |