projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...
[deliverable/linux.git]
/
drivers
/
media
/
platform
/
rcar_jpu.c
diff --git
a/drivers/media/platform/rcar_jpu.c
b/drivers/media/platform/rcar_jpu.c
index 485f5259acb082d4e71484c12ad730c0142dc77c..552789a69c8645bd94af18f71cee62192fa3d80c 100644
(file)
--- a/
drivers/media/platform/rcar_jpu.c
+++ b/
drivers/media/platform/rcar_jpu.c
@@
-1613,6
+1613,7
@@
static const struct of_device_id jpu_dt_ids[] = {
{ .compatible = "renesas,jpu-r8a7791" }, /* M2-W */
{ .compatible = "renesas,jpu-r8a7792" }, /* V2H */
{ .compatible = "renesas,jpu-r8a7793" }, /* M2-N */
+ { .compatible = "renesas,rcar-gen2-jpu" },
{ },
};
MODULE_DEVICE_TABLE(of, jpu_dt_ids);
This page took
0.036836 seconds
and
5
git commands to generate.