projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'spi/topic/altera', 'spi/topic/atmel', 'spi/topic...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
sama5d36.dtsi
diff --git
a/arch/arm/boot/dts/sama5d36.dtsi
b/arch/arm/boot/dts/sama5d36.dtsi
index 6c31c26e6cc09511b9e4cd11b12dc946ecea8aeb..db58cad6acd32633b88bf88a0589885bfa58ed9b 100644
(file)
--- a/
arch/arm/boot/dts/sama5d36.dtsi
+++ b/
arch/arm/boot/dts/sama5d36.dtsi
@@
-8,8
+8,8
@@
*/
#include "sama5d3.dtsi"
#include "sama5d3_can.dtsi"
-#include "sama5d3_emac.dtsi"
#include "sama5d3_gmac.dtsi"
+#include "sama5d3_emac.dtsi"
#include "sama5d3_lcd.dtsi"
#include "sama5d3_mci2.dtsi"
#include "sama5d3_tcb1.dtsi"