removed merge leftover

2019-10-19 09:22:33 +02:00 · 2019-10-19 09:22:33 +02:00 · b6e00419cd
parent 55b15c4681
commit b6e00419cd
1 changed files with 1 additions and 2 deletions
--- a/FunKey/board/funkey/patches/linux/0004-add-funkey-dts.patch
+++ b/FunKey/board/funkey/patches/linux/0004-add-funkey-dts.patch
@ -1,6 +1,6 @@
 --- /dev/null	2019-05-04 09:53:55.553276856 +0200
 +++ a/arch/arm/boot/dts/sun8i-v3s-funkey.dts	2019-05-04 20:06:53.118696800 +0200
-@@ -0,0 +1,162 @@
+@@ -0,0 +1,192 @@
 +/*
 + * Copyright (C) 2019 Michel Stempin <michel.stempin@wanadoo.fr>
 + *
@ -163,7 +163,6 @@
 +               txbuflen = <115200>;
 +               rotate = <0>;
 +               fps = <39>;
->>>>>>> 1e396cd5a62bf81a951592f92e2d89348d35a46a
 +               buswidth = <8>;
 +               reset-gpios = <&pio 4 1 GPIO_ACTIVE_LOW>;	//PE1
 +               dc-gpios = <&pio 2 0 GPIO_ACTIVE_LOW>;		//PC0 (MISO)