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 'nfs-for-4.6-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
socfpga_arria10.dtsi
diff --git
a/arch/arm/boot/dts/socfpga_arria10.dtsi
b/arch/arm/boot/dts/socfpga_arria10.dtsi
index cce9e50acf68a62274b080ee15dba03d203263fe..1c5e139e4d059f2efbc3fc02e3b0dcbe42559f7c 100644
(file)
--- a/
arch/arm/boot/dts/socfpga_arria10.dtsi
+++ b/
arch/arm/boot/dts/socfpga_arria10.dtsi
@@
-63,7
+63,7
@@
ranges;
amba {
- compatible = "
arm,amba
-bus";
+ compatible = "
simple
-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;