diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-01 20:50:26 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-01 20:50:26 (GMT) |
commit | 4cff7adbebf4d25f662b13c6582b945d9d549e25 (patch) | |
tree | cfb6bc0aaab6ad7fa7ca2bb07453ed2fd139138c /drivers/iommu/io-pgtable-arm.c | |
parent | 7e3933df9874b70745548ce9177295d11c58fc21 (diff) | |
parent | 36f90b0a2ddd60823fe193a85e60ff1906c2a9b3 (diff) | |
download | linux-4cff7adbebf4d25f662b13c6582b945d9d549e25.tar.xz |
Merge 4.5-rc2 into staging-next
This fixes a merge issue with the panel driver, and picks up fixes in
iio and other drivers that we want here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iommu/io-pgtable-arm.c')
-rw-r--r-- | drivers/iommu/io-pgtable-arm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index 8bbcbfe..381ca5a 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -25,6 +25,7 @@ #include <linux/sizes.h> #include <linux/slab.h> #include <linux/types.h> +#include <linux/dma-mapping.h> #include <asm/barrier.h> |