git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
drivers
/
media
/
platform
/
s5p-fimc
/
mipi-csis.c
diff --git
a/drivers/media/platform/s5p-fimc/mipi-csis.c
b/drivers/media/platform/s5p-fimc/mipi-csis.c
index
8e4eed8
..
e92236a
100644
(file)
--- a/
drivers/media/platform/s5p-fimc/mipi-csis.c
+++ b/
drivers/media/platform/s5p-fimc/mipi-csis.c
@@
-26,7
+26,7
@@
#include <linux/spinlock.h>
#include <linux/videodev2.h>
#include <media/v4l2-subdev.h>
-#include <
plat/mipi_
csis.h>
+#include <
linux/platform_data/mipi-
csis.h>
#include "mipi-csis.h"
static int debug;