diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-12-08 04:04:26 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-12-08 04:04:26 +0300 |
| commit | e876b41ab074561d65f213bf5e0fc68cf5bc7380 (patch) | |
| tree | 5bcbd7e4f7b6ac2a34e61011f8eb2cde90bf8603 /arch/arm/boot/dts/armada-38x.dtsi | |
| parent | 47c0fd72822159eb501411f975f5672a0bf7a7fb (diff) | |
| parent | 527e9316f8ec44bd53d90fb9f611fa7ffff52bb9 (diff) | |
| download | linux-e876b41ab074561d65f213bf5e0fc68cf5bc7380.tar.xz | |
Back merge tag 'v4.4-rc4' into drm-next
We've picked up a few conflicts and it would be nice
to resolve them before we move onwards.
Diffstat (limited to 'arch/arm/boot/dts/armada-38x.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/armada-38x.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi index c6a0e9d7f1a9..e8b7f6726772 100644 --- a/arch/arm/boot/dts/armada-38x.dtsi +++ b/arch/arm/boot/dts/armada-38x.dtsi @@ -498,6 +498,7 @@ reg = <0x70000 0x4000>; interrupts-extended = <&mpic 8>; clocks = <&gateclk 4>; + tx-csum-limit = <9800>; status = "disabled"; }; |