diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-14 00:52:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-14 00:52:12 +0200 |
| commit | ca17749259d26f7ddbb0678790d5d534018d0a6b (patch) | |
| tree | 730e0bd336e78d673760df2b4116277af1c8c495 /arch/arm/boot/dts/exynos4.dtsi | |
| parent | drivers: tty: Fix use-after-free in pty_common_install (diff) | |
| parent | Linux 3.16-rc5 (diff) | |
| download | linux-ca17749259d26f7ddbb0678790d5d534018d0a6b.tar.xz linux-ca17749259d26f7ddbb0678790d5d534018d0a6b.zip | |
Merge 3.16-rc5 into tty-next.
We want those fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/exynos4.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/exynos4.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index 536d3c3553b2..93bcc1fe8a4e 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -558,7 +558,7 @@ interrupts = <0 37 0>, <0 38 0>, <0 39 0>, <0 40 0>, <0 41 0>; clocks = <&clock CLK_PWM>; clock-names = "timers"; - #pwm-cells = <2>; + #pwm-cells = <3>; status = "disabled"; }; |