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
/
mpc8315erdb.dts
diff --git
a/arch/powerpc/boot/dts/mpc8315erdb.dts
b/arch/powerpc/boot/dts/mpc8315erdb.dts
index d2cdd47a246d5a94e112ac4888f0896b24fe0c6b..072c9b0f8c8e837845e8bb9af1b5a433186e675d 100644
(file)
--- a/
arch/powerpc/boot/dts/mpc8315erdb.dts
+++ b/
arch/powerpc/boot/dts/mpc8315erdb.dts
@@
-117,7
+117,6
@@
interrupt-parent = <&ipic>;
dfsrr;
rtc@68 {
- device_type = "rtc";
compatible = "dallas,ds1339";
reg = <0x68>;
};