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 '6.6-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
staging
/
media
/
imx
/
imx-media-capture.c
diff --git
a/drivers/staging/media/imx/imx-media-capture.c
b/drivers/staging/media/imx/imx-media-capture.c
index 4364df27c6d281582c8f506cb676d40fd12b18d4..4846078315ff3acd966498334d2bf88987d9306c 100644
(file)
--- a/
drivers/staging/media/imx/imx-media-capture.c
+++ b/
drivers/staging/media/imx/imx-media-capture.c
@@
-7,7
+7,6
@@
#include <linux/delay.h>
#include <linux/fs.h>
#include <linux/module.h>
-#include <linux/of_platform.h>
#include <linux/pinctrl/consumer.h>
#include <linux/platform_device.h>
#include <linux/sched.h>