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 /arch/arm/mach-omap2/omap_hwmod_44xx_data.c | |
| parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff) | |
| parent | 2ab7c84815cffd5fe4946a472fc67fefa8ac3c29 (diff) | |
| download | olio-linux-3.10-18e170d03bcd17f5ccb35b271a95783f63145be7.tar.xz olio-linux-3.10-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 'arch/arm/mach-omap2/omap_hwmod_44xx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 0b1249e0039..1e00ea8b90e 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -28,10 +28,10 @@ #include <plat/dma.h> #include <linux/platform_data/spi-omap2-mcspi.h> #include <linux/platform_data/asoc-ti-mcbsp.h> +#include <linux/platform_data/iommu-omap.h> #include <plat/mmc.h> #include <plat/dmtimer.h> #include <plat/common.h> -#include <plat/iommu.h> #include "omap_hwmod_common_data.h" #include "cm1_44xx.h" |