diff options
| author |   Vladimir Barinov <vladimir.barinov@cogentembedded.com> | 2018-02-02 20:27:28 +0300 |
|---|---|---|
| committer | Vladimir Barinov <vladimir.barinov@cogentembedded.com> | 2018-02-26 23:24:53 +0300 |
| commit | 39c18a8c2b230e21b2b4ba171fe4a300afcbe888 (patch) | |
| tree | a8da68eab05c14d8a0ada6489472d432445ef644 | |
| parent | 4ca6923b470abbf254d25dc205fe4a80d6f7139b (diff) | |
Fix merge conflict
Fix build fail
| -rw-r--r-- | meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0040-arm64-dts-renesas-add-ADAS-boards.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0040-arm64-dts-renesas-add-ADAS-boards.patch b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0040-arm64-dts-renesas-add-ADAS-boards.patch index b33ccc9..c9f9d8c 100644 --- a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0040-arm64-dts-renesas-add-ADAS-boards.patch +++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0040-arm64-dts-renesas-add-ADAS-boards.patch @@ -17983,7 +17983,7 @@ new file mode 100644 index 0000000..92a3300 --- /dev/null +++ b/arch/arm64/boot/dts/renesas/ulcb-vb2.dtsi -@@ -0,0 +1,1656 @@ +@@ -0,0 +1,1660 @@ +/* + * Device Tree Source for the ULCB Videobox V2 board + * |