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 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
boot
/
dts
/
mpc8378_rdb.dts
diff --git
a/arch/powerpc/boot/dts/mpc8378_rdb.dts
b/arch/powerpc/boot/dts/mpc8378_rdb.dts
index 7a2bad038bd611926b1acdf48b5820ef203bd782..23c10ce22c2cd6b95597e52a975eed284d54ddea 100644
(file)
--- a/
arch/powerpc/boot/dts/mpc8378_rdb.dts
+++ b/
arch/powerpc/boot/dts/mpc8378_rdb.dts
@@
-117,7
+117,6
@@
interrupt-parent = <&ipic>;
dfsrr;
rtc@68 {
- device_type = "rtc";
compatible = "dallas,ds1339";
reg = <0x68>;
};