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 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
boot
/
dts
/
qcom
/
sm8250-sony-xperia-edo.dtsi
diff --git
a/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi
b/arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi
index e819b5b773637e2aaccb53120418cd45fd576ea6..549e0a2aa9fe4ff29d9a56d6dfeff183b53a5e77 100644
(file)
--- a/
arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi
+++ b/
arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi
@@
-57,7
+57,7
@@
* case, they are both on &pm8150b_gpios: camera focus(2), camera snapshot(1).
*/
- vol-down {
+
key-
vol-down {
label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>;
gpios = <&pm8150_gpios 1 GPIO_ACTIVE_LOW>;