Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

[~andy/linux] / arch / arm / boot / dts / sama5d35ek.dts

diff --git a/arch/arm/boot/dts/sama5d35ek.dts b/arch/arm/boot/dts/sama5d35ek.dts
index a488fc4e9777884af7193902e201f61747a52805..509a53d9cc7baee10258878cd257d8574d6b25e0 100644 (file)
--- a/arch/arm/boot/dts/sama5d35ek.dts
+++ b/arch/arm/boot/dts/sama5d35ek.dts
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later.
  */
 /dts-v1/;
-/include/ "sama5d3xmb.dtsi"
+#include "sama5d3xmb.dtsi"
 
 / {
        model = "Atmel SAMA5D35-EK";
@@ -48,7 +48,7 @@
 
                pb_user1 {
                        label = "pb_user1";
-                       gpios = <&pioE 27 0>;
+                       gpios = <&pioE 27 GPIO_ACTIVE_HIGH>;
                        linux,code = <0x100>;
                        gpio-key,wakeup;
                };