git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'md/4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
tegra114-roth.dts
diff --git
a/arch/arm/boot/dts/tegra114-roth.dts
b/arch/arm/boot/dts/tegra114-roth.dts
index 38acf78d7815fab2ab14842503a4bf79c040f9ed..9d868af97b8e5083f4964b316e4b582cc94776f8 100644
(file)
--- a/
arch/arm/boot/dts/tegra114-roth.dts
+++ b/
arch/arm/boot/dts/tegra114-roth.dts
@@
-1047,7
+1047,7
@@
label = "Power";
gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>;
-
gpio-key,wakeup
;
+
wakeup-source
;
};
};