diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-05-09 09:34:49 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-05-09 09:34:49 +0200 |
| commit | 725d0123dfff3d7b666cf57f5d29c50addfc99d3 (patch) | |
| tree | 12ec63b2c3965033f30185b4b2f5f12039a9a242 /arch/arm/boot/dts/am4372.dtsi | |
| parent | mcb: Delete num_cells variable which is not required (diff) | |
| parent | Linux 4.6-rc7 (diff) | |
| download | linux-725d0123dfff3d7b666cf57f5d29c50addfc99d3.tar.xz linux-725d0123dfff3d7b666cf57f5d29c50addfc99d3.zip | |
Merge 4.6-rc7 into char-misc-testing
This resolves a merge issue with drivers/hv/ring_buffer.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/am4372.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/am4372.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi index 344b861a55a5..ba580a9da390 100644 --- a/arch/arm/boot/dts/am4372.dtsi +++ b/arch/arm/boot/dts/am4372.dtsi @@ -884,7 +884,7 @@ gpmc: gpmc@50000000 { compatible = "ti,am3352-gpmc"; ti,hwmods = "gpmc"; - dmas = <&edma 52>; + dmas = <&edma 52 0>; dma-names = "rxtx"; clocks = <&l3s_gclk>; clock-names = "fck"; |