diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-10-23 04:57:50 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-10-23 04:57:50 (GMT) |
commit | 274035751e25ee15a064e43cde7b4e7a9b75d921 (patch) | |
tree | bf5f3f18f14855043324ef02a116532d866e3dac /arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | |
parent | 53e597b1d194910bef53ed0632da329fef497904 (diff) | |
parent | a5be88f63eaff1c03774aecd7388015cb87f6b2c (diff) | |
download | linux-274035751e25ee15a064e43cde7b4e7a9b75d921.tar.xz |
Merge branch 'topic/hw-constraint-single' into for-next
Diffstat (limited to 'arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi')
-rw-r--r-- | arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi index 79ffdfe..3b43e57 100644 --- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi +++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi @@ -472,7 +472,6 @@ */ pinctrl-0 = <&pwm0_out &pwm1_out &pwm2_out &pwm3_out>; pinctrl-names = "default"; - samsung,pwm-outputs = <0>; status = "okay"; }; |