diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-11-25 14:47:27 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-11-25 14:47:27 -0800 |
| commit | 6310f3a9362e8fa2e29c8f84aa603b5f86e98442 (patch) | |
| tree | b071c5e43cc2075f9fa7f07bcc0101a56b779c35 /arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | |
| parent | b2ff4790612bbfa3433cc92e56445c2a40098e2c (diff) | |
| parent | edd5eb4e99e4153ea7be05390fda542d986bf28d (diff) | |
| download | talos-op-linux-6310f3a9362e8fa2e29c8f84aa603b5f86e98442.tar.gz talos-op-linux-6310f3a9362e8fa2e29c8f84aa603b5f86e98442.zip | |
Merge branch 'dt-regressions' into omap-for-v3.13/fixes-take4
Diffstat (limited to 'arch/powerpc/boot/dts/fsl/t4240si-post.dtsi')
| -rw-r--r-- | arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi index 510afa362de1..4143a9733cd0 100644 --- a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi @@ -387,8 +387,8 @@ reg = <0xea000 0x4000>; }; -/include/ "qoriq-dma-0.dtsi" -/include/ "qoriq-dma-1.dtsi" +/include/ "elo3-dma-0.dtsi" +/include/ "elo3-dma-1.dtsi" /include/ "qoriq-espi-0.dtsi" spi@110000 { |
