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>

diff --git a/extras/keymap/95-keymap.rules b/extras/keymap/95-keymap.rules
index af39c21b0e68de14f88269b09b6e063194b9af00..dd58453a15b65477e06727fa689dea563d5f2715 100644 (file)
--- 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 f90a4fd01f2a5c5bdcc57b57cf312d983673ebcd..6443b4bebc5d4f1425dc7bfae6b2d2d527987500 100644 (file)
--- 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