git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
boot
/
dts
/
microchip
/
sparx5_pcb134.dts
diff --git
a/arch/arm64/boot/dts/microchip/sparx5_pcb134.dts
b/arch/arm64/boot/dts/microchip/sparx5_pcb134.dts
index feee4e99ff57cbc36d40eb09f318e5cb012762c9..45ca1af7e85002d47fddac88fe4071d32a9973c2 100644
(file)
--- a/
arch/arm64/boot/dts/microchip/sparx5_pcb134.dts
+++ b/
arch/arm64/boot/dts/microchip/sparx5_pcb134.dts
@@
-5,6
+5,7
@@
/dts-v1/;
#include "sparx5_pcb134_board.dtsi"
+#include "sparx5_nand.dtsi"
/ {
model = "Sparx5 PCB134 Reference Board (NAND)";