diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-02 12:24:14 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-20 10:05:01 -0800 |
| commit | 2ab7c84815cffd5fe4946a472fc67fefa8ac3c29 (patch) | |
| tree | da99b0b6c04b96384c141653db34a0f772b0bfb2 /drivers | |
| parent | 7bd9e25fa4e1eab0adb2632a0752e0835850dfb7 (diff) | |
| download | op-kernel-dev-2ab7c84815cffd5fe4946a472fc67fefa8ac3c29.zip op-kernel-dev-2ab7c84815cffd5fe4946a472fc67fefa8ac3c29.tar.gz | |
ARM: OMAP2+: Move iommu/iovmm headers to platform_data
Move iommu/iovmm headers from plat/ to platform_data/ as part of the
single zImage work.
Partially based on an earlier version by Ido Yariv <ido@wizery.com>.
Cc: Ido Yariv <ido@wizery.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Omar Ramirez Luna <omar.luna@linaro.org>
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Acked-by: Ohad Ben-Cohen <ohad@wizery.com>
Acked-by: Joerg Roedel <joro@8bytes.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/iommu/omap-iommu-debug.c | 3 | ||||
| -rw-r--r-- | drivers/iommu/omap-iommu.c | 2 | ||||
| -rw-r--r-- | drivers/iommu/omap-iommu2.c | 2 | ||||
| -rw-r--r-- | drivers/iommu/omap-iovmm.c | 3 | ||||
| -rw-r--r-- | drivers/media/platform/omap3isp/ispvideo.c | 1 |
5 files changed, 4 insertions, 7 deletions
diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c index d0427bd..d97fbe4 100644 --- a/drivers/iommu/omap-iommu-debug.c +++ b/drivers/iommu/omap-iommu-debug.c @@ -19,8 +19,7 @@ #include <linux/platform_device.h> #include <linux/debugfs.h> #include <linux/omap-iommu.h> - -#include <plat/iommu.h> +#include <linux/platform_data/iommu-omap.h> #include "omap-iopgtable.h" #include "omap-iommu.h" diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c index df84087..badc17c 100644 --- a/drivers/iommu/omap-iommu.c +++ b/drivers/iommu/omap-iommu.c @@ -26,7 +26,7 @@ #include <asm/cacheflush.h> -#include <plat/iommu.h> +#include <linux/platform_data/iommu-omap.h> #include "omap-iopgtable.h" #include "omap-iommu.h" diff --git a/drivers/iommu/omap-iommu2.c b/drivers/iommu/omap-iommu2.c index 29e98a2..c020202 100644 --- a/drivers/iommu/omap-iommu2.c +++ b/drivers/iommu/omap-iommu2.c @@ -19,8 +19,8 @@ #include <linux/omap-iommu.h> #include <linux/slab.h> #include <linux/stringify.h> +#include <linux/platform_data/iommu-omap.h> -#include <plat/iommu.h> #include "omap-iommu.h" /* diff --git a/drivers/iommu/omap-iovmm.c b/drivers/iommu/omap-iovmm.c index 3e3b242..46d87569 100644 --- a/drivers/iommu/omap-iovmm.c +++ b/drivers/iommu/omap-iovmm.c @@ -18,12 +18,11 @@ #include <linux/scatterlist.h> #include <linux/iommu.h> #include <linux/omap-iommu.h> +#include <linux/platform_data/iommu-omap.h> #include <asm/cacheflush.h> #include <asm/mach/map.h> -#include <plat/iommu.h> - #include "omap-iopgtable.h" #include "omap-iommu.h" diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c index a4b8290..21f7313 100644 --- a/drivers/media/platform/omap3isp/ispvideo.c +++ b/drivers/media/platform/omap3isp/ispvideo.c @@ -35,7 +35,6 @@ #include <linux/vmalloc.h> #include <media/v4l2-dev.h> #include <media/v4l2-ioctl.h> -#include <plat/iommu.h> #include <plat/omap-pm.h> #include "ispvideo.h" |
