Merge tag 'regmap-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[deliverable/linux.git] / arch / arm / boot / dts / da850.dtsi

diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index 2c88313d2c7af6730772f4a4e53c8797fd6fda8d..d70ba5504481d90b796872d4c258061cb8de4b4d 100644 (file)
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -7,7 +7,7 @@
  * Free Software Foundation;  either version 2 of the  License, or (at your
  * option) any later version.
  */
-/include/ "skeleton.dtsi"
+#include "skeleton.dtsi"
 
 / {
        arm {
@@ -37,7 +37,7 @@
                        #size-cells = <0>;
                        pinctrl-single,bit-per-mux;
                        pinctrl-single,register-width = <32>;
-                       pinctrl-single,function-mask = <0xffffffff>;
+                       pinctrl-single,function-mask = <0xf>;
                        status = "disabled";
 
                        nand_cs3_pins: pinmux_nand_pins {