Merge branch 'printk-rework' into for-linus

[linux-2.6-microblaze.git] / arch / arm / boot / dts / imx6q-dhcom-pdk2.dts

diff --git a/arch/arm/boot/dts/imx6q-dhcom-pdk2.dts b/arch/arm/boot/dts/imx6q-dhcom-pdk2.dts
index a2dd7e5..a685b1c 100644 (file)
--- a/arch/arm/boot/dts/imx6q-dhcom-pdk2.dts
+++ b/arch/arm/boot/dts/imx6q-dhcom-pdk2.dts
@@ -253,7 +253,6 @@
 &pwm1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_pwm1>;
-       #pwm-cells = <3>;
        status = "okay";
 };