diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-30 21:38:59 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-30 21:38:59 -0800 |
| commit | 794b175fc0c0c4844dbb7b137a73bbfd01f6c608 (patch) | |
| tree | 69b9394b5b09118f9877cd02838a7cd2d7c4f63c /drivers/media/platform/omap3isp/isp.h | |
| parent | 4fabb6332a2b747c7f6783f146a8fb3d2f88d91c (diff) | |
| parent | 2ab7c84815cffd5fe4946a472fc67fefa8ac3c29 (diff) | |
Merge tag 'omap-for-v3.8/cleanup-headers-iommu-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
From Tony Lindgren:
Move most of remaining omap iommu code to drivers/iommu.
This is needed for the multiplatform kernels as the plat
and mach headers cannot be included.
These changes were agreed to be merged via the arm-soc
tree by Joerg and Ohad as these will cause some merge
conflicts with the other related clean-up branches.
So omap-for-v3.8/cleanup-headers-iommu should be added
as one of the depends branches for arm-soc.
* tag 'omap-for-v3.8/cleanup-headers-iommu-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: Move iommu/iovmm headers to platform_data
ARM: OMAP2+: Make some definitions local
ARM: OMAP2+: Move iommu2 to drivers/iommu/omap-iommu2.c
ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h
ARM: OMAP2+: Move iopgtable header to drivers/iommu/
ARM: OMAP: Merge iommu2.h into iommu.h
Conflicts due to surrounding changes fixed up in:
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
drivers/media/platform/omap3isp/ispvideo.c
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/media/platform/omap3isp/isp.h')
| -rw-r--r-- | drivers/media/platform/omap3isp/isp.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/platform/omap3isp/isp.h b/drivers/media/platform/omap3isp/isp.h index 8be7487c326..8d6866942b8 100644 --- a/drivers/media/platform/omap3isp/isp.h +++ b/drivers/media/platform/omap3isp/isp.h @@ -31,11 +31,9 @@ #include <media/v4l2-device.h> #include <linux/device.h> #include <linux/io.h> +#include <linux/iommu.h> #include <linux/platform_device.h> #include <linux/wait.h> -#include <linux/iommu.h> -#include <plat/iommu.h> -#include <plat/iovmm.h> #include "ispstat.h" #include "ispccdc.h" |