mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
huitui
This commit is contained in:
parent
5d8b8466f8
commit
208159358c
5 changed files with 174 additions and 0 deletions
|
|
@ -1,5 +1,6 @@
|
|||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts 2020-04-19 11:02:56.505715879 +0200
|
||||
+++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts 2020-04-19 11:03:53.620780390 +0200
|
||||
@@ -196,7 +196,7 @@
|
||||
|
|
@ -20,11 +21,16 @@
|
|||
=======
|
||||
=======
|
||||
>>>>>>> parent of 602cd0b... fixomr
|
||||
=======
|
||||
>>>>>>> parent of 602cd0b... fixomr
|
||||
--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts.anc 2020-11-16 15:48:00.852410183 +0100
|
||||
+++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts 2020-11-16 15:49:23.878965822 +0100
|
||||
@@ -210,27 +210,27 @@
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> parent of 602cd0b... fixomr
|
||||
=======
|
||||
>>>>>>> parent of 602cd0b... fixomr
|
||||
=======
|
||||
>>>>>>> parent of 602cd0b... fixomr
|
||||
|
|
@ -34,11 +40,14 @@
|
|||
+ label = "lan";
|
||||
};
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
*/
|
||||
=======
|
||||
>>>>>>> parent of 602cd0b... fixomr
|
||||
=======
|
||||
>>>>>>> parent of 602cd0b... fixomr
|
||||
=======
|
||||
>>>>>>> parent of 602cd0b... fixomr
|
||||
|
||||
port@1 {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue