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 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sama5d3.dtsi
diff --git
a/arch/arm/boot/dts/sama5d3.dtsi
b/arch/arm/boot/dts/sama5d3.dtsi
index 8fa423c52592d246df438faad08af525558fe5fd..2d0935ad2225d6c3500e9c7034982150f2ff1071 100644
(file)
--- a/
arch/arm/boot/dts/sama5d3.dtsi
+++ b/
arch/arm/boot/dts/sama5d3.dtsi
@@
-1003,7
+1003,7
@@
clock-names = "slow_clk", "main_xtal";
};
- reset_controller: r
stc
@fffffe00 {
+ reset_controller: r
eset-controller
@fffffe00 {
compatible = "atmel,sama5d3-rstc", "atmel,at91sam9g45-rstc";
reg = <0xfffffe00 0x10>;
clocks = <&clk32k>;