diff options
author | Joerg Roedel <joro@8bytes.org> | 2012-12-03 18:40:59 +0100 |
---|---|---|
committer | Joerg Roedel <joro@8bytes.org> | 2012-12-03 18:40:59 +0100 |
commit | 18e170d03bcd17f5ccb35b271a95783f63145be7 (patch) | |
tree | 5ce68cab628b93119d4c160efc6092e1ba6fa93e /drivers/iommu/omap-iommu-debug.c | |
parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff) | |
parent | 2ab7c84815cffd5fe4946a472fc67fefa8ac3c29 (diff) | |
download | kernel_replicant_linux-18e170d03bcd17f5ccb35b271a95783f63145be7.tar.gz kernel_replicant_linux-18e170d03bcd17f5ccb35b271a95783f63145be7.tar.bz2 kernel_replicant_linux-18e170d03bcd17f5ccb35b271a95783f63145be7.zip |
Merge branch 'omap-for-v3.8/cleanup-headers-iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/omap
Diffstat (limited to 'drivers/iommu/omap-iommu-debug.c')
-rw-r--r-- | drivers/iommu/omap-iommu-debug.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c index f55fc5dfbadc..d97fbe4fb9b1 100644 --- a/drivers/iommu/omap-iommu-debug.c +++ b/drivers/iommu/omap-iommu-debug.c @@ -18,11 +18,11 @@ #include <linux/uaccess.h> #include <linux/platform_device.h> #include <linux/debugfs.h> +#include <linux/omap-iommu.h> +#include <linux/platform_data/iommu-omap.h> -#include <plat/iommu.h> -#include <plat/iovmm.h> - -#include <plat/iopgtable.h> +#include "omap-iopgtable.h" +#include "omap-iommu.h" #define MAXCOLUMN 100 /* for short messages */ |