Merge tag 'pull-work.fd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / arch / arm / boot / dts / pxa25x.dtsi

diff --git a/arch/arm/boot/dts/pxa25x.dtsi b/arch/arm/boot/dts/pxa25x.dtsi
index a248bf0..5f8300e 100644 (file)
--- a/arch/arm/boot/dts/pxa25x.dtsi
+++ b/arch/arm/boot/dts/pxa25x.dtsi
@@ -38,9 +38,12 @@
                        compatible = "marvell,pdma-1.0";
                        reg = <0x40000000 0x10000>;
                        interrupts = <25>;
-                       #dma-channels = <16>;
                        #dma-cells = <2>;
+                       /* For backwards compatibility: */
+                       #dma-channels = <16>;
+                       dma-channels = <16>;
                        #dma-requests = <40>;
+                       dma-requests = <40>;
                        status = "okay";
                };