diff options
| author | Joerg Roedel | 2012-12-03 18:40:59 +0100 |
|---|---|---|
| committer | Joerg Roedel | 2012-12-03 18:40:59 +0100 |
| commit | 18e170d03bcd17f5ccb35b271a95783f63145be7 (patch) | |
| tree | 5ce68cab628b93119d4c160efc6092e1ba6fa93e /drivers/media/platform/omap3isp/isp.c | |
| parent | Linux 3.7-rc7 (diff) | |
| parent | ARM: OMAP2+: Move iommu/iovmm headers to platform_data (diff) | |
| download | kernel-qcow2-linux-18e170d03bcd17f5ccb35b271a95783f63145be7.tar.gz kernel-qcow2-linux-18e170d03bcd17f5ccb35b271a95783f63145be7.tar.xz kernel-qcow2-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/media/platform/omap3isp/isp.c')
| -rw-r--r-- | drivers/media/platform/omap3isp/isp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index 99640d8c1db0..7f182f0ff3da 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c @@ -61,6 +61,7 @@ #include <linux/i2c.h> #include <linux/interrupt.h> #include <linux/module.h> +#include <linux/omap-iommu.h> #include <linux/platform_device.h> #include <linux/regulator/consumer.h> #include <linux/slab.h> |