git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.31' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
boot
/
dts
/
mpc8379_rdb.dts
diff --git
a/arch/powerpc/boot/dts/mpc8379_rdb.dts
b/arch/powerpc/boot/dts/mpc8379_rdb.dts
index
98ae95b
..
d4838af
100644
(file)
--- a/
arch/powerpc/boot/dts/mpc8379_rdb.dts
+++ b/
arch/powerpc/boot/dts/mpc8379_rdb.dts
@@
-167,7
+167,7
@@
};
sdhci@2e000 {
- compatible = "fsl,mpc8379-esdhc";
+ compatible = "fsl,mpc8379-esdhc"
, "fsl,esdhc"
;
reg = <0x2e000 0x1000>;
interrupts = <42 0x8>;
interrupt-parent = <&ipic>;