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
/
at91sam9261.dtsi
diff --git
a/arch/arm/boot/dts/at91sam9261.dtsi
b/arch/arm/boot/dts/at91sam9261.dtsi
index 7adc36ca8a467572f18612f7cf4ff14321ab4735..259aca5653051f8db6d7c4b302b595b512bfd7bb 100644
(file)
--- a/
arch/arm/boot/dts/at91sam9261.dtsi
+++ b/
arch/arm/boot/dts/at91sam9261.dtsi
@@
-603,7
+603,7
@@
clock-names = "slow_xtal", "main_xtal";
};
- r
stc
@fffffd00 {
+ r
eset-controller
@fffffd00 {
compatible = "atmel,at91sam9260-rstc";
reg = <0xfffffd00 0x10>;
clocks = <&slow_xtal>;