diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-28 10:07:11 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-28 10:07:20 +0400 |
| commit | 6b914c998787d65022e80d6262dfd0edef58cadb (patch) | |
| tree | ec9d9605ae08e6e40664c4302a181979ab4fe1d3 /drivers/media/platform/omap3isp/ispvideo.c | |
| parent | 1f87a404d02a96519284e1928445ca5cfe9667db (diff) | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
| download | linux-6b914c998787d65022e80d6262dfd0edef58cadb.tar.xz | |
Merge tag 'v3.8-rc5' into next/cleanup
Linux 3.8-rc5
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/media/platform/omap3isp/ispvideo.c')
| -rw-r--r-- | drivers/media/platform/omap3isp/ispvideo.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c index e0d73a642186..8dac17511e61 100644 --- a/drivers/media/platform/omap3isp/ispvideo.c +++ b/drivers/media/platform/omap3isp/ispvideo.c @@ -35,9 +35,6 @@ #include <linux/vmalloc.h> #include <media/v4l2-dev.h> #include <media/v4l2-ioctl.h> -#include <plat/iommu.h> -#include <plat/iovmm.h> -#include <plat/omap-pm.h> #include "ispvideo.h" #include "isp.h" |