projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'mkp-scsi/4.5/scsi-fixes' into fixes
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
omap3-devkit8000-common.dtsi
diff --git
a/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
b/arch/arm/boot/dts/omap3-devkit8000-common.dtsi
index
9ca2865
..
86850bb
100644
(file)
--- a/
arch/arm/boot/dts/omap3-devkit8000-common.dtsi
+++ b/
arch/arm/boot/dts/omap3-devkit8000-common.dtsi
@@
-64,7
+64,7
@@
label = "user";
gpios = <&gpio1 26 GPIO_ACTIVE_HIGH>;
linux,code = <BTN_EXTRA>;
-
gpio-key,wakeup
;
+
wakeup-source
;
};
};