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 'mmc-updates-for-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
boot
/
dts
/
mpc5121.dtsi
diff --git
a/arch/powerpc/boot/dts/mpc5121.dtsi
b/arch/powerpc/boot/dts/mpc5121.dtsi
index 2e82d0e71dd3e383bd33adc3bb9c870d5076519d..bd14c00e5146b31a90c8913e2b605c06d40184f1 100644
(file)
--- a/
arch/powerpc/boot/dts/mpc5121.dtsi
+++ b/
arch/powerpc/boot/dts/mpc5121.dtsi
@@
-152,6
+152,8
@@
compatible = "fsl,mpc5121-sdhc";
reg = <0x1500 0x100>;
interrupts = <8 0x8>;
+ dmas = <&dma0 30>;
+ dma-names = "rx-tx";
};
i2c@1700 {