git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'media/v6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[sfrench/cifs-2.6.git]
/
drivers
/
staging
/
media
/
imx
/
imx-media-dev-common.c
diff --git
a/drivers/staging/media/imx/imx-media-dev-common.c
b/drivers/staging/media/imx/imx-media-dev-common.c
index 46bf717255b3efbf44c4f4968359cdcebaf5fb72..0d0ee8627a2dd82b400d7cc66ff5c4d331c39e44 100644
(file)
--- a/
drivers/staging/media/imx/imx-media-dev-common.c
+++ b/
drivers/staging/media/imx/imx-media-dev-common.c
@@
-6,8
+6,6
@@
* Copyright (c) 2016 Mentor Graphics Inc.
*/
-#include <linux/of_graph.h>
-#include <linux/of_platform.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-event.h>
#include <media/v4l2-ioctl.h>