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
/
imx51-zii-rdu1.dts
diff --git
a/arch/arm/boot/dts/imx51-zii-rdu1.dts
b/arch/arm/boot/dts/imx51-zii-rdu1.dts
index 469cce2c03573b5f32d6534ef753b34b4547cd5d..e45a15ceb94bc4f88a4e89029dd5c18fb7e81853 100644
(file)
--- a/
arch/arm/boot/dts/imx51-zii-rdu1.dts
+++ b/
arch/arm/boot/dts/imx51-zii-rdu1.dts
@@
-508,7
+508,7
@@
};
ds1341: rtc@68 {
- compatible = "
maxim
,ds1341";
+ compatible = "
dallas
,ds1341";
reg = <0x68>;
};