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 branch 'kvm-tsx-ctrl' into HEAD
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
logicpd-torpedo-som.dtsi
diff --git
a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
index 3fdd0a72f87f795b43d049a262ae5e3d7df2b967..506b118e511a6705007b4fe3decdcb8656eb65f2 100644
(file)
--- a/
arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+++ b/
arch/arm/boot/dts/logicpd-torpedo-som.dtsi
@@
-192,3
+192,7
@@
&twl_gpio {
ti,use-leds;
};
+
+&twl_keypad {
+ status = "disabled";
+};