projects
/
~shefty
/
rdma-dev.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.8-rc3' into v4l_for_linus
[~shefty/rdma-dev.git]
/
drivers
/
media
/
platform
/
omap3isp
/
ispvideo.c
diff --git
a/drivers/media/platform/omap3isp/ispvideo.c
b/drivers/media/platform/omap3isp/ispvideo.c
index
e0d73a6
..
8dac175
100644
(file)
--- 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"