hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/30-keymap-hp.fdi |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
diff-tree 20de779322130941372c8e6318bd648c1565b006 (from 524fac6e193cb69e596be25755ed4fc907c0d15f)
Author: Scott Clark <probiscus12 at gmail.com>
Date:   Tue Aug 28 23:05:43 2007 +0200

    keymap quirk patch for HP Pavilion dv2500 laptop
    
    Added keymap quirk patch for HP Pavilion dv2500 laptop.

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index e855b1b..b1b988d 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -7,6 +7,13 @@
     <match key="@input.originating_device:info.linux.driver" string="atkbd">
 
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Hewlett-Packard">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="dv2500">
+          <append key="input.keymap.data" type="strlist">e00a:screenlock</append> <!-- FnF6 (lock) -->
+          <append key="input.keymap.data" type="strlist">e031:help</append>	<!-- FnF1 (help) -->
+          <append key="input.keymap.data" type="strlist">e059:f22</append>	<!-- touchpad on  -->
+          <append key="input.keymap.data" type="strlist">e058:f22</append>	<!-- touchpad off -->
+          <append key="info.capabilities" type="strlist">input.keymap</append>
+        </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nx5000">
           <append key="input.keymap.data" type="strlist">e001:screenlock</append>	<!-- FnEsc -->
           <append key="input.keymap.data" type="strlist">e008:tv</append>	<!-- SVideo/Presentation -->