diff options
| author | Joerg Roedel <joro@8bytes.org> | 2012-12-03 21:40:59 +0400 |
|---|---|---|
| committer | Joerg Roedel <joro@8bytes.org> | 2012-12-03 21:40:59 +0400 |
| commit | 18e170d03bcd17f5ccb35b271a95783f63145be7 (patch) | |
| tree | 5ce68cab628b93119d4c160efc6092e1ba6fa93e /arch/arm/mach-omap2/devices.c | |
| parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff) | |
| parent | 2ab7c84815cffd5fe4946a472fc67fefa8ac3c29 (diff) | |
| download | linux-18e170d03bcd17f5ccb35b271a95783f63145be7.tar.xz | |
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 'arch/arm/mach-omap2/devices.c')
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index c72b5a727720..c15f5a97b51c 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -127,7 +127,7 @@ static struct platform_device omap2cam_device = { #if defined(CONFIG_IOMMU_API) -#include <plat/iommu.h> +#include <linux/platform_data/iommu-omap.h> static struct resource omap3isp_resources[] = { { |