projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
media
/
i2c
/
adv7343.c
diff --git
a/drivers/media/i2c/adv7343.c
b/drivers/media/i2c/adv7343.c
index
d4e15a6
..
9d38f7b
100644
(file)
--- a/
drivers/media/i2c/adv7343.c
+++ b/
drivers/media/i2c/adv7343.c
@@
-26,12
+26,12
@@
#include <linux/videodev2.h>
#include <linux/uaccess.h>
#include <linux/of.h>
#include <linux/videodev2.h>
#include <linux/uaccess.h>
#include <linux/of.h>
+#include <linux/of_graph.h>
#include <media/adv7343.h>
#include <media/v4l2-async.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ctrls.h>
#include <media/adv7343.h>
#include <media/v4l2-async.h>
#include <media/v4l2-device.h>
#include <media/v4l2-ctrls.h>
-#include <media/v4l2-of.h>
#include "adv7343_regs.h"
#include "adv7343_regs.h"
@@
-410,7
+410,7
@@
adv7343_get_pdata(struct i2c_client *client)
if (!IS_ENABLED(CONFIG_OF) || !client->dev.of_node)
return client->dev.platform_data;
if (!IS_ENABLED(CONFIG_OF) || !client->dev.of_node)
return client->dev.platform_data;
- np =
v4l2_of
_get_next_endpoint(client->dev.of_node, NULL);
+ np =
of_graph
_get_next_endpoint(client->dev.of_node, NULL);
if (!np)
return NULL;
if (!np)
return NULL;