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 branch 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[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 4e0c26423d8477e5c70bafc767269164cacf70e8..59ef13e37536c917ecf5caa5db0e5647fed7fa4d 100644
(file)
--- a/
arch/arm/boot/dts/socfpga_arria10.dtsi
+++ b/
arch/arm/boot/dts/socfpga_arria10.dtsi
@@
-628,7
+628,7
@@
status = "disabled";
};
- sdr: sdr@ffc
250
00 {
+ sdr: sdr@ffc
fb1
00 {
compatible = "altr,sdr-ctl", "syscon";
reg = <0xffcfb100 0x80>;
};