diff options
| author | Will Deacon <will.deacon@arm.com> | 2017-10-17 12:33:13 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2017-10-17 12:33:13 +0100 |
| commit | 0515ce0ff82d39a7576bd98c1f59ca1d2b98386d (patch) | |
| tree | 3f6fbf3ffdf35dd56b32df9dc7cec81f0b753ca1 /include | |
| parent | 7b77452ec524fa845efdec28ae16e2202cf797dc (diff) | |
| parent | 65637901a3409f8a7952750e975536bde70fa1f8 (diff) | |
| download | linux-0515ce0ff82d39a7576bd98c1f59ca1d2b98386d.tar.gz linux-0515ce0ff82d39a7576bd98c1f59ca1d2b98386d.tar.bz2 linux-0515ce0ff82d39a7576bd98c1f59ca1d2b98386d.zip | |
Merge tag 'acpi/iort-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/linux into aarch64/for-next/core
Pull arm64 ACPI IORT updates from Lorenzo Pieralisi:
- Code clean-ups (A.Yadav, L.Pieralisi)
- Platform devices inizialization rework in preparation for IORT PMCG
handling (L.Pieralisi)
- Mapping API rework to enable MSIs for IORT components as defined in
IORT specification issue C (H.Guo, L.Pieralisi)
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/acpi_iort.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/acpi_iort.h b/include/linux/acpi_iort.h index 8d3f0bf80379..2f7a29242b87 100644 --- a/include/linux/acpi_iort.h +++ b/include/linux/acpi_iort.h @@ -49,8 +49,8 @@ static inline void acpi_configure_pmsi_domain(struct device *dev) { } /* IOMMU interface */ static inline void iort_dma_setup(struct device *dev, u64 *dma_addr, u64 *size) { } -static inline -const struct iommu_ops *iort_iommu_configure(struct device *dev) +static inline const struct iommu_ops *iort_iommu_configure( + struct device *dev) { return NULL; } #endif |