projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v4.8-rc1' into patchwork
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
qcom-apq8064-asus-nexus7-flo.dts
diff --git
a/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
b/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
index
32fedfa
..
7b05f07
100644
(file)
--- a/
arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
+++ b/
arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
@@
-29,12
+29,6
@@
gpio-keys {
compatible = "gpio-keys";
- power {
- label = "Power";
- gpios = <&tlmm_pinmux 26 GPIO_ACTIVE_LOW>;
- linux,code = <KEY_POWER>;
- gpio-key,wakeup;
- };
volume_up {
label = "Volume Up";
gpios = <&pm8921_gpio 4 GPIO_ACTIVE_HIGH>;