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 'char-misc-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sun5i-a10s.dtsi
diff --git
a/arch/arm/boot/dts/sun5i-a10s.dtsi
b/arch/arm/boot/dts/sun5i-a10s.dtsi
index ddb25452d78e10239ef0a7a85ca5ba73cb59c3e4..ee17b1c379e319fb852cc47099abe8ca2a61af83 100644
(file)
--- a/
arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/
arch/arm/boot/dts/sun5i-a10s.dtsi
@@
-378,7
+378,7
@@
};
sid: eeprom@01c23800 {
- compatible = "allwinner,sun4i-sid";
+ compatible = "allwinner,sun4i-
a10-
sid";
reg = <0x01c23800 0x10>;
};