projects
/
linux-2.6-microblaze.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/drivers', 'spi/topic/dw', 'spi/topic/efm32...
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
sama5d36.dtsi
diff --git
a/arch/arm/boot/dts/sama5d36.dtsi
b/arch/arm/boot/dts/sama5d36.dtsi
index
6c31c26
..
db58cad
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"