projects
/
GitHub
/
LineageOS
/
android_kernel_samsung_universal7580.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
[GitHub/LineageOS/android_kernel_samsung_universal7580.git]
/
drivers
/
media
/
platform
/
omap3isp
/
ispvideo.c
diff --git
a/drivers/media/platform/omap3isp/ispvideo.c
b/drivers/media/platform/omap3isp/ispvideo.c
index e0d73a642186d34ae63d841cabe3f42c57604acd..8dac17511e618c84d27a9db8bbfbd7587f5c1d2a 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"