summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerone Young <jerone.young@canonical.com>2010-04-05 18:45:35 -0500
committerMartin Pitt <martin.pitt@ubuntu.com>2010-04-06 09:57:14 +0200
commit5fa8992c9c2e756aefe84a41f00c7a2555e8d975 (patch)
tree2184729ff35363fee78b6f2a4c5f200684604928
parente22aa83ba0b09796d02ebe831a4a66ab7d9f5c1e (diff)
Revert special casing 0xD8 to latitude XT only
Now that Dell has changed the functionality of upcoming machines with touchpad toggle to only use keycode 0xD9 .. and not 0xD8 & 0xD9. It seems best to add this back to the general map of Dell buttons. Just incase a machine in the future uses this later. Signed-off-by: Jerone Young <jerone.young@canonical.com> Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
-rw-r--r--extras/keymap/95-keymap.rules1
-rw-r--r--extras/keymap/keymaps/dell1
2 files changed, 1 insertions, 1 deletions
diff --git a/extras/keymap/95-keymap.rules b/extras/keymap/95-keymap.rules
index af39c21b0e..dd58453a15 100644
--- a/extras/keymap/95-keymap.rules
+++ b/extras/keymap/95-keymap.rules
@@ -54,7 +54,6 @@ LABEL="keyboard_vendorcheck"
ENV{DMI_VENDOR}=="Dell*", RUN+="keymap $name dell"
ENV{DMI_VENDOR}=="Dell*", ATTR{[dmi/id]product_name}=="Inspiron 1011", RUN+="keymap $name 0x84 wlan"
-ENV{DMI_VENDOR}=="Dell*", ATTR{[dmi/id]product_name}=="Latitude XT*", RUN+="keymap $name 0xD8 screenlock"
ENV{DMI_VENDOR}=="Compaq*", ATTR{[dmi/id]product_name}=="*E500*|*Evo N*", RUN+="keymap $name compaq-e_evo"
diff --git a/extras/keymap/keymaps/dell b/extras/keymap/keymaps/dell
index f90a4fd01f..6443b4bebc 100644
--- a/extras/keymap/keymaps/dell
+++ b/extras/keymap/keymaps/dell
@@ -24,4 +24,5 @@
0xA2 playpause # Front panel play/pause
0xA4 stopcd # Front panel stop
0xED media # MediaDirect button
+0xD8 screenlock # FIXME: Tablet lock button
0xD9 f22 # touchpad toggle