aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/exynos4.dtsi
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-13 15:52:12 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-13 15:52:12 -0700
commitca17749259d26f7ddbb0678790d5d534018d0a6b (patch)
tree730e0bd336e78d673760df2b4116277af1c8c495 /arch/arm/boot/dts/exynos4.dtsi
parent07584d4a356ef52c084e1e4fedc22858ffc2f8b2 (diff)
parent1795cd9b3a91d4b5473c97f491d63892442212ab (diff)
downloadlinux-stericsson-ca17749259d26f7ddbb0678790d5d534018d0a6b.tar.gz
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.dtsi2
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";
};