diff options
| author | Joerg Roedel <jroedel@suse.de> | 2020-05-27 14:53:11 +0300 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2020-05-29 18:17:44 +0300 |
| commit | 786dfe496e3b30b92d11cf7ae1d36d1a458702f6 (patch) | |
| tree | 6404499cc19d0c9ceecc85d4f6112371ba2e3a5d /drivers/iommu/amd_iommu.c | |
| parent | e1980df36c5c94899df1fd71f0b0a6dba457051c (diff) | |
| download | linux-786dfe496e3b30b92d11cf7ae1d36d1a458702f6.tar.xz | |
iommu/amd: Merge private header files
Merge amd_iommu_proto.h into amd_iommu.h.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Reviewed-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Link: https://lore.kernel.org/r/20200527115313.7426-9-joro@8bytes.org
Diffstat (limited to 'drivers/iommu/amd_iommu.c')
| -rw-r--r-- | drivers/iommu/amd_iommu.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 1faf2e0dad32..862c8d5e63d6 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -22,7 +22,6 @@ #include <linux/dma-direct.h> #include <linux/dma-iommu.h> #include <linux/iommu-helper.h> -#include <linux/iommu.h> #include <linux/delay.h> #include <linux/amd-iommu.h> #include <linux/notifier.h> @@ -43,8 +42,7 @@ #include <asm/gart.h> #include <asm/dma.h> -#include "amd_iommu_proto.h" -#include "amd_iommu_types.h" +#include "amd_iommu.h" #include "irq_remapping.h" #define CMD_SET_TYPE(cmd, t) ((cmd)->data[1] |= ((t) << 28)) |