diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-04-05 12:56:47 +0200 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-04-05 12:56:47 +0200 |
| commit | 6ea7e3873e52902af9ee8c0837450fdb69d54140 (patch) | |
| tree | b291dad174446387a166763cfbf3dd351148ecbe /drivers/media/platform/rcar_jpu.c | |
| parent | scsi: Do not attach VPD to devices that don't support it (diff) | |
| parent | Linux 4.6-rc1 (diff) | |
| download | linux-6ea7e3873e52902af9ee8c0837450fdb69d54140.tar.xz linux-6ea7e3873e52902af9ee8c0837450fdb69d54140.zip | |
Merge branch 'fixes-base' into fixes
Diffstat (limited to 'drivers/media/platform/rcar_jpu.c')
| -rw-r--r-- | drivers/media/platform/rcar_jpu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/platform/rcar_jpu.c b/drivers/media/platform/rcar_jpu.c index 485f5259acb0..552789a69c86 100644 --- 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); |