diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-04-14 21:28:32 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-04-14 21:28:32 (GMT) |
| commit | 4b2f8838479eb2abe042e094f7d2cced6d5ea772 (patch) | |
| tree | 5ef3236b354a494c8d71a572896283e44989c696 /arch/arm/boot/dts/omap2.dtsi | |
| parent | c848791f0336914a3081ea3fe029cf177d81de81 (diff) | |
| parent | 9fd85eb502a78bd812db58bd1f668b2a06ee30a5 (diff) | |
| download | linux-4b2f8838479eb2abe042e094f7d2cced6d5ea772.tar.xz | |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'arch/arm/boot/dts/omap2.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/omap2.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/omap2.dtsi b/arch/arm/boot/dts/omap2.dtsi index 59d1c29..578fa2a 100644 --- a/arch/arm/boot/dts/omap2.dtsi +++ b/arch/arm/boot/dts/omap2.dtsi @@ -87,8 +87,8 @@ <14>, <15>; #dma-cells = <1>; - #dma-channels = <32>; - #dma-requests = <64>; + dma-channels = <32>; + dma-requests = <64>; }; i2c1: i2c@48070000 { |