diff options
author | 2015-04-14 22:28:32 +0100 | |
---|---|---|
committer | 2015-04-14 22:28:32 +0100 | |
commit | 4b2f8838479eb2abe042e094f7d2cced6d5ea772 (patch) | |
tree | 5ef3236b354a494c8d71a572896283e44989c696 /arch/arm/boot/dts/omap3.dtsi | |
parent | Merge branches 'misc', 'vdso' and 'fixes' into for-next (diff) | |
parent | ARM: pmu: add support for interrupt-affinity property (diff) | |
download | linux-dev-4b2f8838479eb2abe042e094f7d2cced6d5ea772.tar.xz linux-dev-4b2f8838479eb2abe042e094f7d2cced6d5ea772.zip |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'arch/arm/boot/dts/omap3.dtsi')
-rw-r--r-- | arch/arm/boot/dts/omap3.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index 01b71111bd55..f4f78c40b564 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi @@ -155,8 +155,8 @@ <14>, <15>; #dma-cells = <1>; - #dma-channels = <32>; - #dma-requests = <96>; + dma-channels = <32>; + dma-requests = <96>; }; omap3_pmx_core: pinmux@48002030 { |